Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 30 Oct 2013 20:44:12 +0000 (21:44 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 30 Oct 2013 20:44:12 +0000 (21:44 +0100)

Trivial merge