Merge branch '2.0' of github.com:WoltLab/com.woltlab.wcf.conversation into 2.0
authorAlexander Ebert <ebert@woltlab.com>
Thu, 15 Jan 2015 20:24:50 +0000 (21:24 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 15 Jan 2015 20:24:50 +0000 (21:24 +0100)

Trivial merge