From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 14 Nov 2019 21:13:23 +0000 (+0100)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=aee6dd0ba45cf12f014050bbab234d9e4b0d03ab;p=people%2Fstevee%2Fipfire-2.x.git

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

aee6dd0ba45cf12f014050bbab234d9e4b0d03ab