Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 16 Feb 2014 22:48:29 +0000 (23:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 16 Feb 2014 22:48:29 +0000 (23:48 +0100)

Trivial merge