Merge remote-tracking branch 'origin/master' into fifteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 4 Jan 2014 10:49:01 +0000 (11:49 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 4 Jan 2014 10:49:01 +0000 (11:49 +0100)

Trivial merge