diff libpurple/conversation.c @ 24242:9ebd288d7b77

merge of '1f22186ba9290bcae0deaea09d4fd38867f773e6' and '8887c6d877944752bc2756d893d9b0acc81277a8'
author Richard Laager <rlaager@wiktel.com>
date Sat, 25 Oct 2008 19:03:42 +0000
parents abf8ebd4c9e1
children 5ebfa814b9e8 7f552614ec8a e4fa83bb82e0 22b8a92fb5ee
line wrap: on
line diff