Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 10 Jan 2015 02:23:04 +0000 (03:23 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 10 Jan 2015 02:23:04 +0000 (03:23 +0100)

Trivial merge