Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorAlexander Ebert <ebert@woltlab.com>
Tue, 23 Jun 2015 17:35:31 +0000 (19:35 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 23 Jun 2015 17:35:31 +0000 (19:35 +0200)

Trivial merge