From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 28 Jan 2015 21:49:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'ummeegge/lynis' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe53fa8dac070d884e05aa423ec5c854a8997fbd;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'ummeegge/lynis' into next

Conflicts:
	make.sh
---

fe53fa8dac070d884e05aa423ec5c854a8997fbd