Merge remote-tracking branch 'ummeegge/lynis' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:49:36 +0000 (22:49 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 28 Jan 2015 21:49:36 +0000 (22:49 +0100)
Conflicts:
make.sh

1  2 
lfs/squid-accounting
make.sh
src/squid-accounting/acct-lib.pl

Simple merge
diff --cc make.sh
Simple merge
Simple merge