Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:34:06 +0000 (18:34 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Fri, 28 Aug 2015 16:34:06 +0000 (18:34 +0200)

Trivial merge