diff libpurple/conversation.h @ 30779:23b7b1b817c8

merge of '5af6a35c4c39341b79cc8d61c700da2b874b9b6b' and 'b4a877b5d355860851acfe7ac186ba5d4f88d684'
author masca@cpw.pidgin.im
date Sun, 06 Jun 2010 21:27:12 +0000
parents dcd52d2b1b97
children c0945d2291b9 6c660dc7cb6a
line wrap: on
line diff