diff libpurple/conversation.h @ 32117:2a47dc416d07

merge of '64f4eb5c598356fe1b8b9bc376faa66641096eda' and '7a3b366378bf6f406686d54b6ca590831f18d2b1'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 13 Jun 2011 17:28:01 +0000
parents d72d728226dc
children 5ffd5582f5fe 47f7b8ca6149
line wrap: on
line diff