From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 9 Oct 2009 08:55:43 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2606
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2d95a2779d704789c06717380eecf4f893e45856;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

2d95a2779d704789c06717380eecf4f893e45856