Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Tue, 9 Apr 2013 20:01:57 +0000 (22:01 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 9 Apr 2013 20:01:57 +0000 (22:01 +0200)

Trivial merge