comparison libpurple/conversation.c @ 32261:952120a8ee02

merge of '0b7caf6b17815fe333d151369f26330d4c662bda' and 'efec3dc757b27366c8b23ca5c0bf1d8605084798'
author Ethan Blanton <elb@pidgin.im>
date Tue, 04 Oct 2011 18:34:45 +0000
parents afb58f3ee8f0
children c0a423e7fea4 3828a61c44da
comparison
equal deleted inserted replaced
32260:714e25ef2550 32261:952120a8ee02