Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 29 Dec 2012 13:48:42 +0000 (14:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 29 Dec 2012 13:48:42 +0000 (14:48 +0100)

Trivial merge