Merge branch 'next' of github.com:WoltLab/WCF into next
authorAlexander Ebert <ebert@woltlab.com>
Fri, 29 Jul 2016 13:26:18 +0000 (15:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 29 Jul 2016 13:26:18 +0000 (15:26 +0200)

Trivial merge