Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 9 May 2012 11:32:35 +0000 (13:32 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 9 May 2012 11:32:35 +0000 (13:32 +0200)

Trivial merge