Merge branch '2.0' of github.com:WoltLab/WCF into 2.0
authorMarcel Werk <burntime@woltlab.com>
Wed, 2 Apr 2014 19:34:35 +0000 (21:34 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 2 Apr 2014 19:34:35 +0000 (21:34 +0200)

Trivial merge