Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/libxmpp.c @ 26728:d06af7664a7a
merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb'
and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 22 Apr 2009 18:37:31 +0000 |
parents | 6f0200f1e497 |
children | 882748e27f9d 242a8c97270b b290c7b9fc73 |