Merge remote-tracking branch 'amarx/firewall-fifteen-beta9' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2013 12:31:38 +0000 (13:31 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 10 Dec 2013 12:31:38 +0000 (13:31 +0100)

Trivial merge