diff libpurple/conversation.h @ 30342:601d519fc6a2

merge of 'bada09db88dffa79646079f34fec29248989c618' and 'e7abe20448d307649f623c608ecd470060b5f40d'
author Mark Doliner <mark@kingant.net>
date Tue, 10 Aug 2010 05:01:27 +0000
parents dcd52d2b1b97
children c0945d2291b9 6c660dc7cb6a
line wrap: on
line diff