Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 11 Feb 2015 22:12:45 +0000 (23:12 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 11 Feb 2015 22:12:45 +0000 (23:12 +0100)

Trivial merge