Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 6 Feb 2015 14:37:12 +0000 (15:37 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 6 Feb 2015 14:37:12 +0000 (15:37 +0100)

Trivial merge