From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 23 Dec 2013 13:59:56 +0000 (+0100)
Subject: Merge remote-tracking branch 'amarx/firewall-beta10' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=1ad5c2fa0713024dce7c14c7b5bd008e3f128cf3

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

1ad5c2fa0713024dce7c14c7b5bd008e3f128cf3