Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 25 Jun 2015 16:50:06 +0000 (18:50 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 25 Jun 2015 16:50:06 +0000 (18:50 +0200)

Trivial merge