Merge remote-tracking branch 'origin/master' into core82
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Sep 2014 15:57:27 +0000 (17:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 9 Sep 2014 15:57:27 +0000 (17:57 +0200)

Trivial merge