From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Tue, 14 Nov 2017 18:17:23 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.23-core131~117^2~182
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5776b677db10ad18aa9972b49900addaa8bf44ba;p=ipfire-2.x.git

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

5776b677db10ad18aa9972b49900addaa8bf44ba