cpw.darkrain42.xmpp.iq-handlers: 1f6758f8: merge of '528b6f92c03b496c915051174c5b85...

Sun Feb 8 02:15:42 EST 2009

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

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 '528b6f92c03b496c915051174c5b85fc46260287'
     and 'cb69e0857b1d9058d5e043a9ff3f3876c98f96f2'