Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 16:22:35 +0000 (18:22 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Jun 2014 16:22:35 +0000 (18:22 +0200)

Trivial merge