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

Merge branch 'master' into basejobv3
---

6ce278e369e22cbd5556b3fec04a77b7a9d3eae1