Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/disco.c @ 20168:426e854b25ff
merge of '035ce608de65ea3a6fab0ab31e845b8c17085853'
and '887f4f4c3543d4601502c165918d5ea69ccad247'
author | Ethan Blanton <elb@pidgin.im> |
---|---|
date | Wed, 19 Sep 2007 02:39:00 +0000 |
parents | 481749fc0b6b |
children | a4b6854737d5 |