From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sat, 17 Oct 2009 15:59:09 +0000 (+0000)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2601
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d981e419fe1f6e48b851691d1b78cc0471394f37;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

d981e419fe1f6e48b851691d1b78cc0471394f37