Mercurial > pidgin.yaz
diff libpurple/conversation.c @ 28066:aeaf60a83b84
merge of '0b43c5f05ed84d95790b3c5370f905758358e36e'
and '561315b6287740585d64d5714065bfe7c06eaefd'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Wed, 29 Jul 2009 19:31:27 +0000 |
parents | ce3bc26aa8cd |
children | 8be4bea98188 338d6a211055 |