diff libpurple/conversation.c @ 20628:b8962a8c5daa

merge of '33aead6e626883ef6ad44b79099f01d2da042d9a' and 'f76b9e1feb23d6a4308ca0c80f5f85765d985aff'
author Mark Doliner <mark@kingant.net>
date Sun, 23 Sep 2007 22:08:46 +0000
parents eb758ca32ea9
children bd7244f3d491 591267f6f1d5
line wrap: on
line diff