From: Michael Tremer Date: Thu, 13 Feb 2014 14:31:25 +0000 (+0100) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next X-Git-Tag: v2.15-beta2~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da9e4e8ed90aae3fc6100bd21cd49804fca6c9bf;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next --- da9e4e8ed90aae3fc6100bd21cd49804fca6c9bf