comparison libpurple/conversation.c @ 24912:b97d8001402d

merge of '5f39c0c7a9b42095bfdc5a3a637fc280da38d729' and '8e99bf9be800f9578d7e94cc4d522d435cfc80dd'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 07 Jan 2009 02:59:36 +0000
parents abf8ebd4c9e1
children 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee
comparison
equal deleted inserted replaced
24889:533d37757363 24912:b97d8001402d