Merge remote-tracking branch 'amarx/firewall-beta10' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 23 Dec 2013 13:59:56 +0000 (14:59 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 23 Dec 2013 13:59:56 +0000 (14:59 +0100)

Trivial merge