From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 17 Oct 2009 08:36:30 +0000 (+0200)
Subject: Merge branch 'master' into mvw/1361
X-Git-Tag: Release-7.0.0~2600^2^2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d8628580f5e43ec26d4816ac521cf2b1675a129b;p=bacula%2Fbacula

Merge branch 'master' into mvw/1361
---

d8628580f5e43ec26d4816ac521cf2b1675a129b