From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Thu, 8 Jun 2017 12:03:56 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.23-core131~117^2~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31313db780f894cdadd74dc4973e0fd6a22a4659;p=ipfire-2.x.git

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

31313db780f894cdadd74dc4973e0fd6a22a4659