Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:13:20 +0000 (00:13 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 9 Dec 2013 23:13:20 +0000 (00:13 +0100)

Trivial merge