From: Arne Fitzenreiter Date: Mon, 11 Jul 2016 13:39:53 +0000 (+0200) 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=d0d869b022b7cc1f103227579c9175d9b2bd167b;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- d0d869b022b7cc1f103227579c9175d9b2bd167b