Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jun 2014 10:41:47 +0000 (12:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 21 Jun 2014 10:41:47 +0000 (12:41 +0200)

Trivial merge