cpw.darkrain42.xmpp.bosh: 650d82b8: explicit merge of 'f29c90f0da72e27c601fd...

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: 650d82b8a5f0c8860804dd8004cd54badea48e1e
Ancestor: 8808ecc9353df49f85e0a292d690631c0ce895b5
Ancestor: f29c90f0da72e27c601fd8c4e1aff2a250a52473
Author: paul at darkrain42.org
Date: 2009-03-07T01:36:57
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/650d82b8a5f0c8860804dd8004cd54badea48e1e

Added files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/qq/buddy_memo.c
        libpurple/protocols/qq/buddy_memo.h po/km.po
        share/ca-certs/AOL_Member_CA.pem
        share/ca-certs/America_Online_Root_Certification_Authority_1.pem
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS configure.ac finch/plugins/gntclipboard.c
        finch/plugins/gntgf.c finch/plugins/grouping.c
        finch/plugins/lastlog.c libpurple/account.h
        libpurple/dnssrv.c libpurple/dnssrv.h libpurple/plugin.h
        libpurple/plugins/autoaccept.c
        libpurple/plugins/codeinline.c libpurple/plugins/newline.c
        libpurple/plugins/offlinemsg.c
        libpurple/plugins/perl/common/Server.xs
        libpurple/plugins/ssl/ssl-gnutls.c libpurple/prefs.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        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/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h
        libpurple/protocols/silc10/silc.c libpurple/proxy.c
        libpurple/purple-remote libpurple/sslconn.h libpurple/util.h
        libpurple/version.h.in pidgin/gtkblist.h pidgin/gtkdialogs.c
        pidgin/gtkprefs.c pidgin/plugins/convcolors.c
        pidgin/plugins/markerline.c pidgin/plugins/pidgininc.c
        pidgin/plugins/timestamp.c pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/af.po po/bn.po po/ca.po po/cs.po po/da.po
        po/de.po po/fr.po po/hu.po po/lt.po po/nb.po po/nn.po
        po/pa.po po/pt_BR.po po/ru.po po/sk.po po/sl.po po/sr.po
        po/sr at latin.po po/sv.po po/zh_HK.po po/zh_TW.po
        share/ca-certs/Makefile.am

ChangeLog: 

explicit merge of 'f29c90f0da72e27c601fd8c4e1aff2a250a52473'
              and '8808ecc9353df49f85e0a292d690631c0ce895b5'
        to branch 'im.pidgin.cpw.darkrain42.xmpp.bosh'