From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 10 Dec 2013 12:31:38 +0000 (+0100)
Subject: Merge remote-tracking branch 'amarx/firewall-fifteen-beta9' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=7d5e022df4b37f157f8528cbce892e273f1b4836

Merge remote-tracking branch 'amarx/firewall-fifteen-beta9' into fifteen
---

7d5e022df4b37f157f8528cbce892e273f1b4836