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-5.0.0~329
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=25f40dafe33c8b5576e89eff1a896b8abe87a45b;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

25f40dafe33c8b5576e89eff1a896b8abe87a45b