From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 18 May 2017 15:41:12 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.19-core112~86
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=9a9cb82c4f73b7ec11a6ebb4e2f50cd319f25aa3

Merge branch 'master' into next
---

9a9cb82c4f73b7ec11a6ebb4e2f50cd319f25aa3