From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 5 Oct 2009 13:02:22 +0000 (+0200)
Subject: Merge commit 'sf/master' into basejobv3
X-Git-Tag: Release-7.0.0~2610
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=feb5ed5cbcef7115c8d9bbd0d1fe33b617c7f12d;p=thirdparty%2Fbacula.git

Merge commit 'sf/master' into basejobv3
---

feb5ed5cbcef7115c8d9bbd0d1fe33b617c7f12d