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

Trivial merge