From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 Feb 2017 21:36:11 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bbcfa1152f87e8092c91284e25184ae52914e6d;p=people%2Fmfischer%2Fipfire-2.x.git

Merge branch 'next'
---

8bbcfa1152f87e8092c91284e25184ae52914e6d