diff libpurple/conversation.c @ 31628:6448e3f3ddd4

merge of '8f2d6c5138602b96aef4fbfbc5b47c202951201b' and 'e8c1e8a79ad64bd73663a15cc0e802b06a8bc733'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Wed, 02 Feb 2011 06:26:19 +0000
parents a8cc50c2279f
children feff62713d9c 6c660dc7cb6a
line wrap: on
line diff