Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Sun, 10 Mar 2013 22:04:07 +0000 (23:04 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 10 Mar 2013 22:04:07 +0000 (23:04 +0100)

Trivial merge