diff libpurple/conversation.c @ 21481:84489b5529a7

merge of 'e9c1dfdac7b1652f8c03584db667bc586c4b295c' and 'f2ac3f0cdea64fd5e603c5350cabf85ed619f5e3'
author Casey Harkins <charkins@pidgin.im>
date Tue, 13 Nov 2007 22:45:51 +0000
parents 1812b8ccfd7a
children 665e04562de0
line wrap: on
line diff