Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 24 Jul 2013 12:22:38 +0000 (14:22 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 24 Jul 2013 12:22:38 +0000 (14:22 +0200)

Trivial merge