From: Marco van Wieringen <mvw@planets.elm.net>
Date: Fri, 4 Feb 2011 09:00:10 +0000 (+0100)
Subject: Merge branch 'Branch-5.1' of git@bsgit:bacula into Branch-5.1
X-Git-Tag: Release-5.2.1~690
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=43679549cedeb65816d3a046f6073546b7e30540;p=bacula%2Fbacula

Merge branch 'Branch-5.1' of git@bsgit:bacula into Branch-5.1
---

43679549cedeb65816d3a046f6073546b7e30540