Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 26 Feb 2014 16:59:53 +0000 (17:59 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 26 Feb 2014 16:59:53 +0000 (17:59 +0100)

Trivial merge