Merge remote-tracking branch 'origin/next' into thirteen
authorArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)
committerArne Fitzenreiter <Arne_F@ipfire.org>
Fri, 26 Oct 2012 07:58:49 +0000 (09:58 +0200)

Trivial merge