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

Trivial merge