From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 13 Sep 2016 17:41:36 +0000 (+0200)
Subject: Merge branch 'core104' into next
X-Git-Tag: v2.19-core106~85^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccba93959baf64aefe8c63d4e44888bb7500b036;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'core104' into next
---

ccba93959baf64aefe8c63d4e44888bb7500b036