Merge remote-tracking branch 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 11 Aug 2013 09:51:40 +0000 (11:51 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 11 Aug 2013 09:51:40 +0000 (11:51 +0200)

Trivial merge