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