Mercurial > pidgin
diff libpurple/conversation.c @ 23580:e8bea84f63b6
merge of '88c7f87fb5a74f975cf06c472059ecf081c54042'
and 'fe134224188f83f69a5367395922807444d46f49'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 21 Jul 2008 06:33:06 +0000 |
parents | 0b6475f97648 |
children | abf8ebd4c9e1 |