diff libpurple/conversation.c @ 27982:7e473a437c7f

merge of '1ce56b5da0a32c13c50761b20f87a319cc55306f' and '634c9cc535f126dc9579bb5f790e77356d55261a'
author Ka-Hing Cheung <khc@hxbc.us>
date Tue, 21 Jul 2009 04:25:59 +0000
parents 01f1929d0936
children c815b2aa78ee 1082e1c25b30 8b17877d3294
line wrap: on
line diff