From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Oct 2013 15:23:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'amarx/firewall-fifteen' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=2a6e9ae967cd13e136cb563622236c979ba788c6

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

2a6e9ae967cd13e136cb563622236c979ba788c6