From: Alexander Marx Date: Wed, 5 Jun 2013 20:11:44 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pre-firewall X-Git-Tag: v2.13-core70~50^2~4^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62a77cbfbe2c5cb835c533eb78b7760edd1e7e1d;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into pre-firewall --- 62a77cbfbe2c5cb835c533eb78b7760edd1e7e1d