Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Sun, 17 Mar 2013 21:33:51 +0000 (22:33 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 17 Mar 2013 21:33:51 +0000 (22:33 +0100)

Trivial merge