Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Mon, 1 Apr 2013 17:33:08 +0000 (19:33 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 1 Apr 2013 17:33:08 +0000 (19:33 +0200)

Trivial merge