Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Sat, 23 May 2015 10:09:28 +0000 (12:09 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 23 May 2015 10:09:28 +0000 (12:09 +0200)

Trivial merge