Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 2 Nov 2013 15:46:15 +0000 (16:46 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 2 Nov 2013 15:46:15 +0000 (16:46 +0100)

Trivial merge