Merge remote-tracking branch 'origin/master' into install-raid
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Sep 2014 18:39:02 +0000 (20:39 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Sep 2014 18:39:02 +0000 (20:39 +0200)

Trivial merge