From: Alexander Marx Date: Wed, 16 Oct 2013 12:22:38 +0000 (+0200) Subject: Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=769185b58ec52fcc9eaedab5df42b1b25057d0c7 Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen --- 769185b58ec52fcc9eaedab5df42b1b25057d0c7