Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 28 May 2013 00:27:59 +0000 (02:27 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 28 May 2013 00:27:59 +0000 (02:27 +0200)

Trivial merge