Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 12 Jun 2013 18:02:52 +0000 (20:02 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 12 Jun 2013 18:02:52 +0000 (20:02 +0200)

Trivial merge