Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorStefan Schantl <stefan.schantl@ipfire.org>
Tue, 21 Jun 2016 08:08:07 +0000 (10:08 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Tue, 21 Jun 2016 08:08:07 +0000 (10:08 +0200)

Trivial merge