From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sat, 10 Aug 2019 14:19:48 +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=c48df86206f7358e23a97cf6cc12d1e43dc3a49f;p=people%2Fstevee%2Fipfire-2.x.git

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

c48df86206f7358e23a97cf6cc12d1e43dc3a49f