Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 14 Jun 2013 00:18:47 +0000 (02:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 14 Jun 2013 00:18:47 +0000 (02:18 +0200)

Trivial merge