From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Wed, 27 Jun 2018 17:33:43 +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~181
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74c193f266e9660c822bfc5e86d050d35539bab6;p=ipfire-2.x.git

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

74c193f266e9660c822bfc5e86d050d35539bab6