Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 24 Jan 2014 16:17:54 +0000 (17:17 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 24 Jan 2014 16:17:54 +0000 (17:17 +0100)

Trivial merge