Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Fri, 24 Apr 2015 22:32:20 +0000 (00:32 +0200)

Trivial merge