Merge remote-tracking branch 'origin/next' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 4 Oct 2013 14:55:20 +0000 (16:55 +0200)

Trivial merge