Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 23 Aug 2018 08:32:21 +0000 (10:32 +0200)

Trivial merge