Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:31:11 +0000 (07:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 11 Apr 2019 05:31:11 +0000 (07:31 +0200)

Trivial merge