Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jan 2014 21:35:11 +0000 (22:35 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 14 Jan 2014 21:35:11 +0000 (22:35 +0100)

Trivial merge