From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 4 Aug 2009 14:13:02 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2654
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=55322dc432fa6079ef699bedfbe9b10c7fec2557;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

55322dc432fa6079ef699bedfbe9b10c7fec2557