Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 9 Oct 2013 10:49:02 +0000 (12:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 9 Oct 2013 10:49:02 +0000 (12:49 +0200)

Trivial merge