From: Alexander Marx Date: Mon, 30 Sep 2013 18:04:05 +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~7^2~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16ba0c00d0d7b223682ab161c23af71315f6826a;p=people%2Fms%2Fipfire-2.x.git Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen --- 16ba0c00d0d7b223682ab161c23af71315f6826a