Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 1 Jan 2012 18:57:35 +0000 (19:57 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 1 Jan 2012 18:57:35 +0000 (19:57 +0100)

Trivial merge