From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 8 Aug 2013 13:01:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'amarx/firewall' into firewall-next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65457ceceb08622f00115cee3ae50e9ccd7c9a58;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'amarx/firewall' into firewall-next
---

65457ceceb08622f00115cee3ae50e9ccd7c9a58