Merge branch '2.0' of github.com:WoltLab/WCF into 2.0
authorAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:39:01 +0000 (01:39 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 5 Apr 2014 23:39:01 +0000 (01:39 +0200)

Trivial merge