Merge https://github.com/friendica/friendica into pull

author friendica <info@friendica.com>

Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)

committer friendica <info@friendica.com>

Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)
author friendica <info@friendica.com>
Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)
committer friendica <info@friendica.com>
Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)
diff --cc include/conversation.php
Simple merge
diff --cc mod/item.php
Simple merge
author	friendica <info@friendica.com>
	Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)
committer	friendica <info@friendica.com>
	Wed, 5 Sep 2012 05:53:32 +0000 (22:53 -0700)
		1	2
include/conversation.php	patch \|	diff1 \|	diff2 \|	blob \| history
mod/item.php	patch \|	diff1 \|	diff2 \|	blob \| history