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-5.0.0~113^2~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=62441805580261d1259b52a117ad6a2f37ec87ef;p=bacula%2Fbacula

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

62441805580261d1259b52a117ad6a2f37ec87ef