Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Nov 2013 11:39:33 +0000 (12:39 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Nov 2013 11:39:33 +0000 (12:39 +0100)

Trivial merge