Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.conversation
authorMarcel Werk <burntime@woltlab.com>
Sat, 29 Dec 2012 02:58:18 +0000 (03:58 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sat, 29 Dec 2012 02:58:18 +0000 (03:58 +0100)

Trivial merge