Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 1 Dec 2013 13:59:16 +0000 (14:59 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 1 Dec 2013 13:59:16 +0000 (14:59 +0100)

Trivial merge