From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 8 Sep 2009 13:48:53 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2634
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b53c09999a4ca024b7db0b232b2483dc9a7866f;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

5b53c09999a4ca024b7db0b232b2483dc9a7866f