From: Eric Bollengier <eric@eb.homelinux.org>
Date: Thu, 5 Nov 2009 14:33:16 +0000 (+0100)
Subject: Merge branch 'master' into basejobv3
X-Git-Tag: Release-5.0.0~280
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cbfb9d2dcea83676236fb520a32afff89453db17;p=bacula%2Fbacula

Merge branch 'master' into basejobv3
---

cbfb9d2dcea83676236fb520a32afff89453db17