diff libpurple/conversation.c @ 24844:1fdec6aa8578

merge of '518ebe34a3f1499bab1208e43f5e9acf69c4ca3e' and 'd092049f615e0cfd10ade1cb459e0827a01638fa'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 27 Dec 2008 09:37:12 +0000
parents abf8ebd4c9e1
children 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee
line wrap: on
line diff