cpw.darkrain42.xmpp.bosh: df23b193: merge of '2fbd079d0e8c53d5a6f240df5232b6...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: df23b1934db9088e250f7509f4bfabb43e601dbf
Ancestor: 2fbd079d0e8c53d5a6f240df5232b63c780212c0
Ancestor: c9fd123647e096ece866dda08832d16860aecd73
Author: paul at darkrain42.org
Date: 2009-03-22T23:44:31
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/df23b1934db9088e250f7509f4bfabb43e601dbf

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API finch/gntlog.c
        finch/gntplugin.c finch/gntroomlist.c libpurple/account.h
        libpurple/blist.h libpurple/circbuffer.c libpurple/dnssrv.c
        libpurple/ft.c libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c
        pidgin/gtknotify.c pidgin/gtknotify.h pidgin/gtkpounce.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of '2fbd079d0e8c53d5a6f240df5232b63c780212c0'
     and 'c9fd123647e096ece866dda08832d16860aecd73'