Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 30 Mar 2012 22:27:34 +0000 (00:27 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 30 Mar 2012 22:27:34 +0000 (00:27 +0200)

Trivial merge