From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 27 Dec 2009 14:59:42 +0000 (+0100)
Subject: Merge branch 'master' into mvw/plugin-changes
X-Git-Tag: Release-7.0.0~2430^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4d08de3298ab78291fbd6dc78c2fa88a715fe3b8;p=bacula%2Fbacula

Merge branch 'master' into mvw/plugin-changes
---

4d08de3298ab78291fbd6dc78c2fa88a715fe3b8