From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Feb 2018 12:06:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/next'
X-Git-Tag: v2.19-core120~9^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2edff5e9700908a3c91a8f0a66862f420faefebd;p=ipfire-2.x.git

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

2edff5e9700908a3c91a8f0a66862f420faefebd