From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 7 Aug 2014 12:59:17 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/ACCOUNTING' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=89e9f46e5bbce78e0b528d183a7ed805ae998f1a;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'amarx/ACCOUNTING' into next

Conflicts:
	make.sh
---

89e9f46e5bbce78e0b528d183a7ed805ae998f1a
diff --cc make.sh
index 4b94c8fed1,d405a05d00..88e710bf34
--- a/make.sh
+++ b/make.sh
@@@ -811,7 -810,8 +811,9 @@@ buildipfire() 
    ipfiremake sslscan
    ipfiremake owncloud
    ipfiremake bacula
 +  ipfiremake batctl
+   ipfiremake perl-PDF-API2
+   ipfiremake squid-accounting
  }
  
  buildinstaller() {