From: Alexander Marx 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-Tag: v2.15-beta1~195^2~7^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71670b91cccc3500d03605673f3966d669c93d70;p=people%2Fms%2Fipfire-2.x.git Merge branch 'firewall-fifteen' of ssh://git.ipfire.org/pub/git/people/amarx/ipfire-2.x into firewall-fifteen --- 71670b91cccc3500d03605673f3966d669c93d70