From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 18 Jun 2019 16:42:02 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9

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

15ca18a3d9efbe8879e8b22f1f72eaeb596ca2f9