Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 14 May 2013 19:12:32 +0000 (21:12 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 14 May 2013 19:12:32 +0000 (21:12 +0200)

Trivial merge