From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 2 Nov 2009 18:00:39 +0000 (+0100)
Subject: Merge branches 'master' and 'kaboom'
X-Git-Tag: Release-7.0.0~2597^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5682a1402e95d4c710f710af4b310ce0600fa040;p=thirdparty%2Fbacula.git

Merge branches 'master' and 'kaboom'
---