From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 6 Aug 2009 20:41:27 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2653
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83d32d30375f7dae0e999dcaf3f06393a5c70ff6;p=thirdparty%2Fbacula.git

Merge branch 'master' into basejobv3
---

83d32d30375f7dae0e999dcaf3f06393a5c70ff6