Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 24 Jun 2013 13:05:43 +0000 (15:05 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 24 Jun 2013 13:05:43 +0000 (15:05 +0200)

Trivial merge