Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Apr 2015 15:11:41 +0000 (17:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 13 Apr 2015 15:11:41 +0000 (17:11 +0200)

Trivial merge