Merge branch: 'Add top-up link to chat text when there is insufficient credit'

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

Fri, 14 Oct 2011 04:21:17 +0000 (15:21 +1100)

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

Fri, 14 Oct 2011 04:21:35 +0000 (15:21 +1100)
author Danielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:21:17 +0000 (15:21 +1100)
committer Danielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:21:35 +0000 (15:21 +1100)
diff --cc libempathy-gtk/empathy-chat.c
Simple merge
diff --cc libempathy-gtk/empathy-theme-adium.c
Simple merge
author	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Fri, 14 Oct 2011 04:21:17 +0000 (15:21 +1100)
committer	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Fri, 14 Oct 2011 04:21:35 +0000 (15:21 +1100)
		1	2
libempathy-gtk/empathy-chat.c	patch \|	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-theme-adium.c	patch \|	diff1 \|	diff2 \|	blob \| history