From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Fri, 6 Sep 2019 05:38:23 +0000 (+0200)
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=070f81d2cd5312e8c0ba49c996457d032798a0b3;p=people%2Fstevee%2Fipfire-2.x.git

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

070f81d2cd5312e8c0ba49c996457d032798a0b3