From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 12 Dec 2017 20:36:55 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Tag: v2.19-core117
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2bebebc0e965fe024958a37ff25281183449a5f;p=people%2Fstevee%2Fipfire-2.x.git

Merge branch 'next'
---

c2bebebc0e965fe024958a37ff25281183449a5f