Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 14 Oct 2012 15:42:35 +0000 (17:42 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 14 Oct 2012 15:42:35 +0000 (17:42 +0200)

Trivial merge