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

Trivial merge