From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Jan 2018 18:46:30 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v2.19-core118~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=00ac9578ef7d09a6bb2ef247d2ee428fcc11239f;p=ipfire-2.x.git

Merge remote-tracking branch 'origin/next'
---

00ac9578ef7d09a6bb2ef247d2ee428fcc11239f