diff libpurple/conversation.c @ 23835:55fdb7a28a7a

merge of '81070314dbb1793818b946813e1f0cdfda74f7ca' and 'bbc2518a5d7e36300f61d147b8133431841f6c9f'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 16 Aug 2008 19:41:05 +0000
parents abf8ebd4c9e1
children 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee
line wrap: on
line diff