From: Alexander Marx Date: Mon, 30 Sep 2013 18:04:38 +0000 (+0200) Subject: Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire... X-Git-Tag: v2.15-beta1~191^2~7^2~5 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=3bb77d08a689ef0b4ebaa88f48a684fe85ec580d Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 3bb77d08a689ef0b4ebaa88f48a684fe85ec580d