Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Sun, 10 Feb 2013 02:57:30 +0000 (03:57 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 10 Feb 2013 02:57:30 +0000 (03:57 +0100)

Trivial merge