From: Eric Bollengier <eric@eb.homelinux.org>
Date: Fri, 23 Oct 2009 12:26:02 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2599
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=04ed7aa59b3c185e750b4d36260afa945612a497;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

04ed7aa59b3c185e750b4d36260afa945612a497