Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 17 Dec 2012 09:16:46 +0000 (10:16 +0100)

Trivial merge