From: Timo Eissler <timo@eissler.pro>
Date: Tue, 15 Jul 2014 19:12:51 +0000 (+0200)
Subject: Merge branch 'bacula' of github.com:morlix/ipfire-2.x into bacula
X-Git-Tag: v2.15-core82~6^2~28^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e405fe9e3aa14116fe58aa0d9affb2bcf554214d;p=ipfire-2.x.git

Merge branch 'bacula' of github.com:morlix/ipfire-2.x into bacula

Conflicts:
	make.sh
---

e405fe9e3aa14116fe58aa0d9affb2bcf554214d