From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 3 Mar 2020 18:25:28 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=82dc25964b3f04d5696fb3da523b98294a29c28d;p=people%2Fstevee%2Fipfire-2.x.git

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

82dc25964b3f04d5696fb3da523b98294a29c28d