Merge branch '2.0' of github.com:WoltLab/WCF into 2.0
authorMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 14:31:17 +0000 (16:31 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 17 May 2014 14:31:17 +0000 (16:31 +0200)

Trivial merge