Merge branch 'next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 8 May 2015 16:31:47 +0000 (18:31 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 8 May 2015 16:31:47 +0000 (18:31 +0200)

Trivial merge