From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 16 May 2018 12:09:42 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core122~149
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4dd7df2f82266d8d7a4474568020a326e9823f40;p=ipfire-2.x.git

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

4dd7df2f82266d8d7a4474568020a326e9823f40