From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 31 Aug 2009 14:20:07 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2640
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2a9e540ed96e9604e6d1f223ee992e54de6d69a0;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

2a9e540ed96e9604e6d1f223ee992e54de6d69a0