From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 2 Oct 2016 14:36:57 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core106~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=642b831b72b42c7ecab4ac05828db2ebc29c3845;p=ipfire-2.x.git

Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
---

642b831b72b42c7ecab4ac05828db2ebc29c3845