Mercurial > pidgin.yaz
diff libpurple/conversation.c @ 26124:46434dc43a63
merge of 'a43fe39095ee00967fa35f7fc14ecd698c4b3241'
and 'be1f71ec3369834e58cb66cfaa0ac17c03fdbe82'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Sat, 10 Jan 2009 01:27:49 +0000 |
parents | abf8ebd4c9e1 |
children | 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee |