Merge branch 'message-editing-rebase'

author Danielle Madeley <danielle.madeley@collabora.co.uk>

Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)

committer Danielle Madeley <danielle.madeley@collabora.co.uk>

Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)
author Danielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)
committer Danielle Madeley <danielle.madeley@collabora.co.uk>
Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)
diff --cc configure.ac
Simple merge
diff --cc libempathy/empathy-message.c
Simple merge
author	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)
committer	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Mon, 20 Jun 2011 10:06:48 +0000 (11:06 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libempathy/empathy-message.c	patch \|	diff1 \|	diff2 \|	blob \| history