From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 21 Mar 2020 16:27:17 +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=368ff87816473357a7647628f07fe9319a238f77;p=people%2Fstevee%2Fipfire-2.x.git

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

368ff87816473357a7647628f07fe9319a238f77