Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Wed, 6 Feb 2013 00:49:12 +0000 (01:49 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 6 Feb 2013 00:49:12 +0000 (01:49 +0100)

Trivial merge