Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 30 Oct 2012 18:58:05 +0000 (19:58 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 30 Oct 2012 18:58:05 +0000 (19:58 +0100)

Trivial merge