From: Eric Bollengier <eric@eb.homelinux.org>
Date: Tue, 11 Aug 2009 08:07:29 +0000 (+0200)
Subject: Merge branch 'master' into bat_slot
X-Git-Tag: Release-7.0.0~2650^2~13^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3d8efcd8a0061cf73d30123115443afa0caf110d;p=thirdparty%2Fbacula.git

Merge branch 'master' into bat_slot
---

3d8efcd8a0061cf73d30123115443afa0caf110d