From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 14 Sep 2009 08:10:11 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2633
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d56e43b557b5f6bd84531fbcefd495a2874e895e;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

d56e43b557b5f6bd84531fbcefd495a2874e895e