Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 9 Jun 2013 14:08:40 +0000 (16:08 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 9 Jun 2013 14:08:40 +0000 (16:08 +0200)

Trivial merge