diff libpurple/conversation.c @ 20798:97bda4a072d2

merge of '1757e82b3ed17d8ad45db9d2c62f0187a8bee93d' and '3d1e069061da093a2d8773199e5938f384f2e9f1'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 06 Oct 2007 17:49:40 +0000
parents eb758ca32ea9
children bd7244f3d491 591267f6f1d5 26f55eb6ab59
line wrap: on
line diff