Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 Aug 2014 19:32:21 +0000 (21:32 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 Aug 2014 19:32:21 +0000 (21:32 +0200)

Trivial merge