From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 11 Dec 2018 07:01:59 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.21-core127~114
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=adde1ca8ce1588997936f5b22687525a2e6637b2

Merge branch 'master' into next
---

adde1ca8ce1588997936f5b22687525a2e6637b2