From: Alexander Marx Date: Mon, 30 Sep 2013 09:06:42 +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=a0a5efd7684e90f8dd8e465f1b54ec4fd043ae4d Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into firewall-fifteen --- a0a5efd7684e90f8dd8e465f1b54ec4fd043ae4d