diff libpurple/conversation.c @ 30524:6d69151fa99b

Merge fix. There is still a change lost that should be re-introduced in libpurple/media
author Marcus Lundblad <ml@update.uu.se>
date Thu, 18 Feb 2010 22:20:06 +0000
parents 163f6c3cbdd9
children 351d07aefb09
line wrap: on
line diff