Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 27 Oct 2014 01:32:45 +0000 (02:32 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 27 Oct 2014 01:32:45 +0000 (02:32 +0100)

Trivial merge