Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 6 Jun 2014 12:58:23 +0000 (14:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 6 Jun 2014 12:58:23 +0000 (14:58 +0200)

Trivial merge