]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
Merge branch 'master' into mvw/plugin-changes
authorMarco van Wieringen <mvw@planets.elm.net>
Sat, 26 Dec 2009 12:54:30 +0000 (13:54 +0100)
committerMarco van Wieringen <mvw@planets.elm.net>
Sat, 26 Dec 2009 12:54:30 +0000 (13:54 +0100)

Trivial merge