From: Arne Fitzenreiter Date: Wed, 11 May 2016 18:59:15 +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=eb797e6ec07add8c6eb1cbd941e3f44c78aef2e7;p=people%2Fms%2Fipfire-2.x.git Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next --- eb797e6ec07add8c6eb1cbd941e3f44c78aef2e7