Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Tue, 15 Jan 2013 23:34:59 +0000 (00:34 +0100)
committerMarcel Werk <burntime@woltlab.com>
Tue, 15 Jan 2013 23:34:59 +0000 (00:34 +0100)

Trivial merge