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

Trivial merge