Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 26 Nov 2013 13:04:11 +0000 (14:04 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 26 Nov 2013 13:04:11 +0000 (14:04 +0100)

Trivial merge