Merge branch '2.0' of github.com:WoltLab/WCF into 2.0
authorAlexander Ebert <ebert@woltlab.com>
Sun, 25 Jan 2015 10:43:01 +0000 (11:43 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 25 Jan 2015 10:43:01 +0000 (11:43 +0100)

Trivial merge