Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 24 Jan 2012 20:40:08 +0000 (21:40 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 24 Jan 2012 20:40:08 +0000 (21:40 +0100)

Trivial merge