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

Trivial merge