From: Alexander Marx Date: Mon, 9 Dec 2013 08:29:50 +0000 (+0100) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen1 X-Git-Tag: v2.15-beta1~121^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8ec686f17764d2c4e62692e7ffc94ad9cbdff53;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen1 --- a8ec686f17764d2c4e62692e7ffc94ad9cbdff53