Merge branch '2.0' of github.com:WoltLab/WCF into 2.0
authorAlexander Ebert <ebert@woltlab.com>
Wed, 14 Jan 2015 20:22:05 +0000 (21:22 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Wed, 14 Jan 2015 20:22:05 +0000 (21:22 +0100)

Trivial merge