Merge branch 'next-lantia' of github.com:WoltLab/com.woltlab.wcf.conversation into...
authorAlexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:26:59 +0000 (15:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 24 Oct 2015 13:26:59 +0000 (15:26 +0200)

Trivial merge