Merge remote-tracking branch 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2015 20:53:06 +0000 (22:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Apr 2015 20:53:06 +0000 (22:53 +0200)

Trivial merge