From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 10 Jun 2017 20:38:32 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.19-core112~30
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=65ca3f05075a11e2bce7daef5980f9bb4715ae84;p=ipfire-2.x.git

Merge branch 'master' into next
---

65ca3f05075a11e2bce7daef5980f9bb4715ae84