diff libpurple/conversation.c @ 21740:ae95a1714442

merge of '0e466dc371b6b9abc7e5c3e8fbccfb5eabd06439' and '9b60657732e2c9dfce01b3f77e91a1bead862eab'
author Richard Nelson <wabz@pidgin.im>
date Mon, 03 Dec 2007 07:02:48 +0000
parents 665e04562de0
children fbef14f35c78
line wrap: on
line diff