From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Mon, 16 Dec 2019 08:04:29 +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=1cb8ffe84d5d3ea1699fa566ce8fa03f50638f4a;p=people%2Fstevee%2Fipfire-2.x.git

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

1cb8ffe84d5d3ea1699fa566ce8fa03f50638f4a