From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 4 Jun 2020 06:59:28 +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=90c1e763b6651adc17ba210611bfb323265b20ab;p=people%2Fms%2Fipfire-2.x.git

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

90c1e763b6651adc17ba210611bfb323265b20ab