diff libpurple/conversation.h @ 26831:7ff22eb86083

merge of '48b95d7d853b96052d4478dd475e60a97e7bda8b' and 'd25c9ed783b024f75fac25f2320ddf5df6907c36'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 06 May 2009 19:03:22 +0000
parents 15ae2dea92b3
children 63cb8c4f3c66 e57315a062cb
line wrap: on
line diff