diff libpurple/conversation.c @ 19369:7df6301c28ed

merge of '90df17ab44d01f7f8f963d36fefb9eae3ec868cf' and 'c7f08defa414414e054c80b1e6fab4a50be7207e'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Thu, 23 Aug 2007 05:59:26 +0000
parents e1062ac14080
children deb9471d7142 3ad938b84843 a28127ed9797 411b5a604a17
line wrap: on
line diff