diff libpurple/conversation.h @ 31322:c20f67f37d2b

propagate from branch 'im.pidgin.pidgin' (head aa3b95627ddc76842b7b33f30bce406d7a689dd8) to branch 'im.pidgin.soc.2010.msn-tlc' (head 33b8ae304dffd42211af00431430a5c492f7e6f0)
author masca@cpw.pidgin.im
date Fri, 29 Oct 2010 17:36:08 +0000
parents dcd52d2b1b97
children c0945d2291b9 6c660dc7cb6a
line wrap: on
line diff