From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 27 May 2018 14:07:07 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core122~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc6df72e6ea9b1f93fa05af5029ce9b649624702;p=ipfire-2.x.git

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

fc6df72e6ea9b1f93fa05af5029ce9b649624702