Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Thu, 8 Jun 2017 12:03:56 +0000 (14:03 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Thu, 8 Jun 2017 12:03:56 +0000 (14:03 +0200)

Trivial merge