From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 26 Sep 2016 21:18:30 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.19-core106~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01176164b5c1989cf37afad36fe967ddfe0f3612;p=ipfire-2.x.git

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

01176164b5c1989cf37afad36fe967ddfe0f3612