Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 May 2014 20:47:13 +0000 (22:47 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 May 2014 20:47:13 +0000 (22:47 +0200)

Trivial merge