cpw.darkrain42.xmpp.iq-handlers: acca0d51: merge of '1f6758f8bdba42d2eeca66535d11e7...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: acca0d51349107702ceedf9b3774f9916de2f25d
Ancestor: 1f6758f8bdba42d2eeca66535d11e7de12d9e715
Ancestor: 7960f1ad9847ca6bd1918ccc6407afbcdc6cfcb8
Author: paul at darkrain42.org
Date: 2009-02-08T07:07:25
Branch: im.pidgin.cpw.darkrain42.xmpp.iq-handlers
URL: http://d.pidgin.im/viewmtn/revision/info/acca0d51349107702ceedf9b3774f9916de2f25d

Modified files:
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/oob.h
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/roster.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h

ChangeLog: 

merge of '1f6758f8bdba42d2eeca66535d11e7de12d9e715'
     and '7960f1ad9847ca6bd1918ccc6407afbcdc6cfcb8'