Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 2 Jun 2013 16:56:11 +0000 (18:56 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 2 Jun 2013 16:56:11 +0000 (18:56 +0200)

Trivial merge