From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 2 Dec 2020 22:43:15 +0000 (+0100)
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=b689391f272ca09b8724f094ab0700890cba13db;p=people%2Fmfischer%2Fipfire-2.x.git

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

b689391f272ca09b8724f094ab0700890cba13db