Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Aug 2013 20:30:15 +0000 (22:30 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 24 Aug 2013 20:30:15 +0000 (22:30 +0200)

Trivial merge