Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Wed, 9 Oct 2013 18:21:01 +0000 (20:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 9 Oct 2013 18:21:01 +0000 (20:21 +0200)

Trivial merge