From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 4 Aug 2009 14:13:02 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-5.0.0~337
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b93d1a74189c93e1a06077694f8252831e97e37c;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

b93d1a74189c93e1a06077694f8252831e97e37c