Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 May 2019 16:04:36 +0000 (18:04 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 1 May 2019 16:04:36 +0000 (18:04 +0200)

Trivial merge