From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 28 Sep 2015 16:42:57 +0000 (+0200)
Subject: Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
X-Git-Tag: v2.17-core95~65
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=16016ff2b0c7e53a580d4584ab4de66e3d77e87d

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

16016ff2b0c7e53a580d4584ab4de66e3d77e87d