From: Eric Bollengier <eric@eb.homelinux.org>
Date: Wed, 30 Sep 2009 09:59:44 +0000 (+0200)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-7.0.0~2616
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=91580252aed0942e864d7b7b851ef8de8a3d03e5;p=bacula%2Fbacula

Merge branch 'master' into basejobv3

Conflicts:
	regress/tests/speed-test
---

91580252aed0942e864d7b7b851ef8de8a3d03e5