Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 31 Jul 2013 20:30:26 +0000 (22:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 31 Jul 2013 20:30:26 +0000 (22:30 +0200)

Trivial merge