From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 May 2017 20:26:45 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into next
X-Git-Tag: v2.19-core112~50^2~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=9376c3ae9251ae24813cac08c1885e3da730675d;hp=--cc

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

9376c3ae9251ae24813cac08c1885e3da730675d