Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 17 May 2013 22:08:55 +0000 (00:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 17 May 2013 22:08:55 +0000 (00:08 +0200)

Trivial merge