Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 24 Dec 2013 00:30:11 +0000 (01:30 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 24 Dec 2013 00:30:11 +0000 (01:30 +0100)

Trivial merge