Merge branch 'next' of github.com:WoltLab/WCF into next
authorMatthias Schmidt <gravatronics@live.com>
Fri, 22 May 2015 19:39:37 +0000 (21:39 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 22 May 2015 19:39:37 +0000 (21:39 +0200)

Trivial merge