Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Sat, 4 Apr 2015 21:49:48 +0000 (23:49 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Sat, 4 Apr 2015 21:49:48 +0000 (23:49 +0200)

Trivial merge