Merge remote-tracking branch 'pochu/misc-fixes'

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

Fri, 14 Oct 2011 04:27:12 +0000 (15:27 +1100)

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

Fri, 14 Oct 2011 04:28:58 +0000 (15:28 +1100)
author Danielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:27:12 +0000 (15:27 +1100)
committer Danielle Madeley <danielle.madeley@collabora.co.uk>
Fri, 14 Oct 2011 04:28:58 +0000 (15:28 +1100)
diff --cc libempathy-gtk/empathy-call-utils.c
Simple merge
diff --cc libempathy-gtk/empathy-ui-utils.c
Simple merge
diff --cc src/empathy-call-window.c
Simple merge
author	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Fri, 14 Oct 2011 04:27:12 +0000 (15:27 +1100)
committer	Danielle Madeley <danielle.madeley@collabora.co.uk>
	Fri, 14 Oct 2011 04:28:58 +0000 (15:28 +1100)
		1	2
libempathy-gtk/empathy-call-utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
libempathy-gtk/empathy-ui-utils.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/empathy-call-window.c	patch \|	diff1 \|	diff2 \|	blob \| history