Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 8 Jun 2014 10:43:49 +0000 (12:43 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 8 Jun 2014 10:43:49 +0000 (12:43 +0200)

Trivial merge