Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 5 Jun 2012 17:55:40 +0000 (19:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 5 Jun 2012 17:55:40 +0000 (19:55 +0200)

Trivial merge