From: Arne Fitzenreiter Date: Thu, 5 Nov 2015 20:39:39 +0000 (+0100) Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea2b8089e69e3741ac3a3f3f24bc9f0b409d04d0;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- ea2b8089e69e3741ac3a3f3f24bc9f0b409d04d0