]> git.sur5r.net Git - bacula/bacula/commitdiff
Merge branch 'master' into mvw/1361
authorMarco van Wieringen <mvw@planets.elm.net>
Sat, 17 Oct 2009 08:36:30 +0000 (10:36 +0200)
committerMarco van Wieringen <mvw@planets.elm.net>
Sat, 17 Oct 2009 08:36:30 +0000 (10:36 +0200)

Trivial merge