Merge pull request #46 from Gravatronics/enhancement/cleanup

author Gravatronics <gravatronics@live.com>

Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)

committer Gravatronics <gravatronics@live.com>

Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)
author Gravatronics <gravatronics@live.com>
Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)
committer Gravatronics <gravatronics@live.com>
Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)
diff --cc files/lib/data/conversation/UserConversationList.class.php
Simple merge
diff --cc files/lib/data/conversation/message/ConversationMessage.class.php
Simple merge
diff --cc files/lib/data/conversation/message/ViewableConversationMessageList.class.php
Simple merge
author	Gravatronics <gravatronics@live.com>
	Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)
committer	Gravatronics <gravatronics@live.com>
	Mon, 31 Dec 2012 16:31:09 +0000 (08:31 -0800)
		1	2
files/lib/data/conversation/UserConversationList.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
files/lib/data/conversation/message/ConversationMessage.class.php	patch \|	diff1 \|	diff2 \|	blob \| history
files/lib/data/conversation/message/ViewableConversationMessageList.class.php	patch \|	diff1 \|	diff2 \|	blob \| history