Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 6 Feb 2013 21:08:19 +0000 (22:08 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 6 Feb 2013 21:08:19 +0000 (22:08 +0100)

Trivial merge