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

Conflicts:
	make.sh
This commit is contained in:
Michael Tremer
2014-08-07 14:59:17 +02:00
16 changed files with 4141 additions and 0 deletions

View File

@@ -812,6 +812,8 @@ buildipfire() {
ipfiremake owncloud
ipfiremake bacula
ipfiremake batctl
ipfiremake perl-PDF-API2
ipfiremake squid-accounting
}
buildinstaller() {