Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 28 Jun 2014 15:08:21 +0000 (17:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 28 Jun 2014 15:08:21 +0000 (17:08 +0200)

Trivial merge