Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 5 Nov 2012 01:15:40 +0000 (02:15 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 5 Nov 2012 01:15:40 +0000 (02:15 +0100)

Trivial merge