Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Thu, 18 Apr 2013 16:08:15 +0000 (18:08 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 18 Apr 2013 16:08:15 +0000 (18:08 +0200)

Trivial merge