Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 12 Feb 2013 23:26:43 +0000 (00:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 12 Feb 2013 23:26:43 +0000 (00:26 +0100)

Trivial merge