Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 26 Oct 2012 13:34:43 +0000 (15:34 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 26 Oct 2012 13:34:43 +0000 (15:34 +0200)

Trivial merge