From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 7 Aug 2009 06:52:42 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2652
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f3a77d749c0a682ded1f80b5c75c14f97d89b1a6;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

f3a77d749c0a682ded1f80b5c75c14f97d89b1a6