Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 22 May 2015 22:15:13 +0000 (00:15 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 22 May 2015 22:15:13 +0000 (00:15 +0200)

Trivial merge