Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 28 Jan 2014 17:37:50 +0000 (18:37 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 28 Jan 2014 17:37:50 +0000 (18:37 +0100)

Trivial merge