From: Alexander Marx <amarx@ipfire.org>
Date: Fri, 27 Sep 2013 13:18:05 +0000 (+0200)
Subject: Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire... 
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=71670b91cccc3500d03605673f3966d669c93d70;hp=439d2a5743d68a7b6108a8db2db91aefd9fac37c

Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen
---