Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 29 Oct 2012 17:28:02 +0000 (18:28 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 29 Oct 2012 17:28:02 +0000 (18:28 +0100)

Trivial merge