Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 24 Feb 2015 11:26:35 +0000 (12:26 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 24 Feb 2015 11:26:35 +0000 (12:26 +0100)

Trivial merge