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

Trivial merge