From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 3 Jan 2020 10:06:47 +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=c5d20f9665a659ddd5fc46fa8cba1c3133a91180;p=people%2Fms%2Fipfire-2.x.git

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

c5d20f9665a659ddd5fc46fa8cba1c3133a91180