comparison libpurple/conversation.c @ 30916:1aa5e2934ef0

merge of 'c7f2cce48dfe465889b7803de44156e7e89e41e0' and 'fafe54ad99f452f7b5d446e154440057c8863bd6'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 03 Sep 2010 07:28:41 +0000
parents 351d07aefb09
children c5ba7dd399fa a8cc50c2279f
comparison
equal deleted inserted replaced
30915:3e7441e05be3 30916:1aa5e2934ef0