Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Thu, 9 Jul 2015 12:45:08 +0000 (14:45 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 9 Jul 2015 12:45:08 +0000 (14:45 +0200)

Trivial merge