Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 5 Feb 2013 19:46:49 +0000 (20:46 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 5 Feb 2013 19:46:49 +0000 (20:46 +0100)

Trivial merge