Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 20 May 2012 18:10:47 +0000 (20:10 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 20 May 2012 18:10:47 +0000 (20:10 +0200)

Trivial merge