From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 5 Jan 2020 11:15:00 +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=0bb159bbfc6dd48bf2b6aa4b4d7e1d87f61e1655;p=people%2Fms%2Fipfire-2.x.git

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

0bb159bbfc6dd48bf2b6aa4b4d7e1d87f61e1655