From: Alexander Marx Date: Fri, 4 Oct 2013 06:09:18 +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=9f6da934a3b635f5c9f96ab737977dad2582e498 Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 9f6da934a3b635f5c9f96ab737977dad2582e498