Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2012 15:21:30 +0000 (16:21 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 13 Mar 2012 15:21:30 +0000 (16:21 +0100)

Trivial merge