From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 10 Nov 2007 10:19:53 +0000 (+0000)
Subject: Merge trunk changes
X-Git-Tag: Release-2.2.6~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=88a6f853f8bbd2dc85babf35c787b82c657868eb;p=bacula%2Fbacula

Merge trunk changes

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.2@5883 91ce42f0-d328-0410-95d8-f526ca767f89
---