From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 1 Jun 2017 13:43:48 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.19-core112~50^2
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=01d89a24d3701e2aa79b0681a20ee64de3c899c4

Merge branch 'master' into next
---

01d89a24d3701e2aa79b0681a20ee64de3c899c4