Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jul 2014 00:01:24 +0000 (02:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 1 Jul 2014 00:01:24 +0000 (02:01 +0200)

Trivial merge