Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jan 2014 10:08:01 +0000 (11:08 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 Jan 2014 10:08:01 +0000 (11:08 +0100)

Trivial merge