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

Trivial merge