Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 26 Nov 2014 01:09:57 +0000 (02:09 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 26 Nov 2014 01:09:57 +0000 (02:09 +0100)

Trivial merge