From: Eric Bollengier <eric@eb.homelinux.org>
Date: Sun, 24 Jan 2010 14:51:32 +0000 (+0100)
Subject: Merge remote branch 'sf/master'
X-Git-Tag: Release-7.0.0~2325
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4f209e4e40b5d8f29bbb35f251f13fd269cfc495;p=bacula%2Fbacula

Merge remote branch 'sf/master'
---

4f209e4e40b5d8f29bbb35f251f13fd269cfc495