From: Alexander Marx Date: Tue, 1 Oct 2013 05:44:29 +0000 (+0200) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen X-Git-Tag: v2.15-beta1~195^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4c27368a7bc135dc4443711c4eeabec0885ce1ff;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen --- 4c27368a7bc135dc4443711c4eeabec0885ce1ff