diff libpurple/conversation.c @ 16871:86ba72a2b31e

merge of '27e1df003532e1209f1f56770923ca4c7674d7ca' and 'ace1e60dda39081ec5404dfa76fa55f79b3e30c6'
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 04 May 2007 04:02:14 +0000
parents 56823a55581a
children 73556f13c3b5 f35329c1094e
line wrap: on
line diff