diff libpurple/conversation.c @ 31125:2291381a9dca

merge of '82b5f258a6715492617fdc4b10fbdb1e6d502d2d' and 'd6123dbf76622d078959b33e7a013efcfd5af34c'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 09 Jan 2011 20:28:58 +0000
parents a8cc50c2279f
children feff62713d9c 6c660dc7cb6a
line wrap: on
line diff