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

Merge branch 'master' into basejobv3
---

244a121b831a75480db24b0e08c747ea5516c9ae