From: Michael Tremer Date: Tue, 18 Jun 2013 14:49:30 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.13-core70~31 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb9f4587df23f92e3008abef4e505b4719925697;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- eb9f4587df23f92e3008abef4e505b4719925697