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