Mercurial > pidgin
diff libpurple/conversation.c @ 25884:212fb65cef7f
explicit merge of 'ba66150a2a1efc5a5cee7204adab69208825630e'
and 'ac72bbedc88fef81dfdd1e2a4b2587010a030657'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:10:31 +0000 |
parents | 5ebfa814b9e8 |
children | a6e3cb32cdd2 |