Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 6 Jul 2015 15:18:13 +0000 (17:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 6 Jul 2015 15:18:13 +0000 (17:18 +0200)

Trivial merge