From: Alexander Marx Date: Wed, 2 Oct 2013 05:22:10 +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~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bcd9852e2ee73b741f5996ecc05ba3758d330fb8;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen --- bcd9852e2ee73b741f5996ecc05ba3758d330fb8