Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 28 Oct 2014 11:13:33 +0000 (12:13 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 28 Oct 2014 11:13:33 +0000 (12:13 +0100)

Trivial merge