diff libpurple/conversation.h @ 28376:ff66496188e0

merge of '899182ae412c1d58eab5efb5001e980fdfda4190' and '9afa0cfda64ff9907b43b21fe64f17f698d2aa0d'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 12 Oct 2009 20:23:50 +0000
parents 63cb8c4f3c66
children b0f0b7a8105a fba8dd643796
line wrap: on
line diff