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)
commitfe53fa8dac070d884e05aa423ec5c854a8997fbd
treefb6a2509cd861fd028ccab43b2d6a9f037d15740
parent14a08a8d15989ace2aa259ddcbc42e4d8a1c890e
parent5ab875af711f98f02cead4688a4f76958d9ff894
Merge remote-tracking branch 'ummeegge/lynis' into next

Conflicts:
make.sh
lfs/squid-accounting
make.sh
src/squid-accounting/acct-lib.pl