Mercurial > pidgin
diff libpurple/conversation.c @ 20059:dae7c3c091e0
merge of '9f5274448f45f6503b6ea291ada3c4e0e00b8c52'
and 'db4583bc475b46b7cb9baa38229f12473d331870'
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Sat, 15 Sep 2007 20:35:41 +0000 |
parents | 7ea794e7cec3 |
children | 6a0d9fa477d4 eb758ca32ea9 |