From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 7 Dec 2018 20:06:45 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core126~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=d05fe8e3e55f1da22ad56ca8ac68b993ff715d05;hp=-c

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
---

d05fe8e3e55f1da22ad56ca8ac68b993ff715d05