From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 31 May 2018 05:01:55 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.21-core122~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2027c75ff34b504aaf220a21f92153261fcfc182;p=ipfire-2.x.git

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

2027c75ff34b504aaf220a21f92153261fcfc182