Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jul 2015 10:33:41 +0000 (12:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 1 Jul 2015 10:33:41 +0000 (12:33 +0200)

Trivial merge