comparison libpurple/conversation.c @ 30325:6f9132dcc21e

merge of '4af706c0918fd1eb930a0f2807a80a9f189b7b98' and 'b96fb413eb4d1392e8ae73177b72639f74da632c'
author Daniel Atallah <daniel.atallah@gmail.com>
date Sun, 01 Aug 2010 13:43:37 +0000
parents 163f6c3cbdd9
children 351d07aefb09
comparison
equal deleted inserted replaced
30324:4a88d29b8bae 30325:6f9132dcc21e