diff libpurple/conversation.h @ 24186:b19a3458e6b2

merge of '59e2b9896f25e8517b3f0f4d742c143e6fccd6e0' and 'c2b5d965f04a15ae8caa5262870b9feae90390d9'
author Marcus Lundblad <ml@update.uu.se>
date Thu, 25 Sep 2008 04:51:19 +0000
parents d73ad65a7d5d
children c87f7c6ab57c
line wrap: on
line diff