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

Trivial merge