From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 17 Aug 2017 13:00:38 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core114~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1043adde982a893b17368f5a2b8d58ff08ef3b2;p=ipfire-2.x.git

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

d1043adde982a893b17368f5a2b8d58ff08ef3b2