From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 5 Aug 2018 15:19:36 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core123~40
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=28b252145a3240caea81d586d3e63db72c573c87

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

28b252145a3240caea81d586d3e63db72c573c87