Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 24 Feb 2012 14:04:25 +0000 (15:04 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 24 Feb 2012 14:04:25 +0000 (15:04 +0100)

Trivial merge