Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/disco.h @ 21148:3635ddf4170f
merge of '6f297cb9eebbeafa2feb340ad3f46f4157854b90'
and '8a99c217891d1f2b2baaeaa0a98248f5eddfc160'
author | Luke Schierer <lschiere@pidgin.im> |
---|---|
date | Mon, 05 Nov 2007 22:03:58 +0000 |
parents | 44b4e8bd759b |
children | 050052891c55 f5e613e05332 |