comparison libpurple/conversation.c @ 32057:d034d1acfe03

merge of '75fc33a55bbcdb1cd95b14f424826226c67018b0' and 'b9857c32002b782a67b23576214ef33234269032'
author Paul Aurich <paul@darkrain42.org>
date Thu, 12 May 2011 02:58:42 +0000
parents a9e077fb65e9
children 8b9e9c61d061 5ffd5582f5fe 47f7b8ca6149
comparison
equal deleted inserted replaced
32054:7d75ffbde679 32057:d034d1acfe03