Mercurial > pidgin.yaz
diff libpurple/conversation.c @ 20577:23a448e8ff79
merge of '6cb0c90b1044b61c7a2c1a7d78c55ef4c5af2bfb'
and 'd2626362a5e64d2cf82ee28b9f6383627e2db635'
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Thu, 20 Sep 2007 16:32:45 +0000 |
parents | eb758ca32ea9 |
children | bd7244f3d491 591267f6f1d5 26f55eb6ab59 |