From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 May 2019 16:04:36 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1f367e0aab3ffb1bc8d5528dc1a383142ab3d92b;p=people%2Fms%2Fipfire-2.x.git

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

1f367e0aab3ffb1bc8d5528dc1a383142ab3d92b