From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 26 Jul 2014 19:34:45 +0000 (+0200)
Subject: Merge remote-tracking branch 'morlix/bacula' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'morlix/bacula' into next

Conflicts:
	make.sh
---

cc7411e791f5e2d6ae807f1dae6f1711fc4c1b1b
diff --cc make.sh
index 62ace29722,9361f78a5c..4ca0549955
--- a/make.sh
+++ b/make.sh
@@@ -807,7 -803,7 +807,8 @@@ buildipfire() 
    ipfiremake iotop
    ipfiremake stunnel
    ipfiremake sslscan
 +  ipfiremake owncloud
+   ipfiremake bacula
  }
  
  buildinstaller() {