cpw.darkrain42.xmpp.bosh: 3e300bce: merge of '0da3644551b2442b2db4cf9d828865...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 3e300bce5054771d58d1ba250bade84fde4f232a
Ancestor: 0da3644551b2442b2db4cf9d828865d167df8072
Ancestor: efc71f836438eb97ec8d2c8e0874326b6fc64774
Author: paul at darkrain42.org
Date: 2008-11-23T03:52:40
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/3e300bce5054771d58d1ba250bade84fde4f232a

Modified files:
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/sametime/sametime.c

ChangeLog: 

merge of '0da3644551b2442b2db4cf9d828865d167df8072'
     and 'efc71f836438eb97ec8d2c8e0874326b6fc64774'