Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 26 Jan 2014 21:46:42 +0000 (22:46 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 26 Jan 2014 21:46:42 +0000 (22:46 +0100)

Trivial merge