From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 20 Aug 2019 20:01:35 +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=33c6ea645f7952aee0dcd33c20581acc270c9da5;p=people%2Fstevee%2Fipfire-2.x.git

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

33c6ea645f7952aee0dcd33c20581acc270c9da5