Merge remote-tracking branch 'friendika/master'
authorFabio Comuni <fabrix.xm@gmail.com>
Fri, 30 Sep 2011 12:31:20 +0000 (14:31 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Fri, 30 Sep 2011 12:31:20 +0000 (14:31 +0200)
1  2 
include/conversation.php

Simple merge