From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 26 May 2020 17:02:48 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cf45236b2aaa4ce095da053ac2d4bf9a08bc724a;p=people%2Fstevee%2Fipfire-2.x.git

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

cf45236b2aaa4ce095da053ac2d4bf9a08bc724a