From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 3 Jul 2018 10:52:18 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core123~76
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=64252706ce374e0253c0d0e274bf2606043d954e

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

64252706ce374e0253c0d0e274bf2606043d954e