diff libpurple/conversation.c @ 26216:9f84925079d5

merge of 'ab47b66449b213d6fbfc728cc1e8c161bed87755' and 'd1d23cd05745079a820abdcd2310300d0be33c50'
author Ka-Hing Cheung <khc@hxbc.us>
date Thu, 26 Mar 2009 05:15:04 +0000
parents a6e3cb32cdd2
children b87843de7c6a b98519a42e53
line wrap: on
line diff