From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Oct 2013 19:10:25 +0000 (+0200)
Subject: Merge branch 'firewall-fifteen' into fifteen
X-Git-Tag: v2.15-beta1~186
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=1da42d53f71991f27603b220e33ac49368410949

Merge branch 'firewall-fifteen' into fifteen
---

1da42d53f71991f27603b220e33ac49368410949