Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Mar 2014 06:30:56 +0000 (07:30 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 27 Mar 2014 06:30:56 +0000 (07:30 +0100)

Trivial merge