Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 Oct 2015 19:02:19 +0000 (21:02 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 21 Oct 2015 19:02:19 +0000 (21:02 +0200)

Trivial merge