From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sat, 26 Dec 2009 12:54:30 +0000 (+0100)
Subject: Merge branch 'master' into mvw/plugin-changes
X-Git-Tag: Release-7.0.0~2430^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ea0a40a3e7d5602465a2c423888b7757452f9e48;p=thirdparty%2Fbacula.git

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

ea0a40a3e7d5602465a2c423888b7757452f9e48