Mercurial > pidgin
diff libpurple/conversation.c @ 21679:a312781708e8
merge of '37d10660345bc1f2092492296caa8deaf84744b4'
and '727439d778b7d7f40aa0230cb9be26765e8d50a9'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Wed, 28 Nov 2007 02:54:31 +0000 |
parents | 665e04562de0 |
children | fbef14f35c78 |