cpw.malu.xmpp.jingle_ft: cf45a19d: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: cf45a19dae7c1016bda443d2e8f1f884e2dca2ef
Ancestor: 49386e2803b1aa94c02cd6bd90f70376a9c3e77c
Ancestor: bceb2e82690de2be4ff9fba2485dbacba0325a98
Author: malu at pidgin.im
Date: 2009-07-17T22:27:39
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/cf45a19dae7c1016bda443d2e8f1f884e2dca2ef

Added files:
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/file-transfer.h
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/ibbs.h
        libpurple/protocols/jabber/jingle/s5b.c
        libpurple/protocols/jabber/jingle/s5b.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
        share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
        share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
Modified files:
        ChangeLog ChangeLog.API configure.ac finch/gntconv.c
        finch/gntrequest.c finch/plugins/Makefile.am
        libpurple/blist.c libpurple/buddyicon.c
        libpurple/certificate.c libpurple/plugins/Makefile.am
        libpurple/plugins/ssl/ssl-nss.c libpurple/prefs.h
        libpurple/privacy.h libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoochat.c libpurple/prpl.c
        libpurple/server.c libpurple/sslconn.c libpurple/sslconn.h
        libpurple/status.c libpurple/tests/test_jabber_jutil.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkutils.c
        pidgin/plugins/Makefile.am
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/fi.po
        po/fr.po po/nn.po po/ru.po po/sv.po
        share/ca-certs/Makefile.am

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head bceb2e82690de2be4ff9fba2485dbacba0325a98)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 49386e2803b1aa94c02cd6bd90f70376a9c3e77c)