Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 21:05:00 +0000 (23:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 16 Jul 2013 21:05:00 +0000 (23:05 +0200)

Trivial merge