diff libpurple/conversation.c @ 23924:5e4aa29dc06f

merge of '9db6cf3ac465ef3a7aca0eee0f47e02d3ea7b162' and 'df9bd43dee8443645563807861da728cd7ae6e26'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 18 Aug 2008 16:03:19 +0000
parents abf8ebd4c9e1
children 7f552614ec8a 5ebfa814b9e8 22b8a92fb5ee
line wrap: on
line diff