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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 3b1ba9926091b4879a81208b3c83ba4c1df871fa
Ancestor: 2804e079dabcf7bd4515349ad7b5a2c4ab7ddc7a
Ancestor: a582dd339f019301adca693df4b1a8fb135a1774
Author: malu at pidgin.im
Date: 2009-12-06T18:25:27
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/3b1ba9926091b4879a81208b3c83ba4c1df871fa

Added files:
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/auth_scram.h
        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
        libpurple/tests/test_jabber_scram.c
Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 NEWS configure.ac
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/oscar.c libpurple/proxy.c
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c libpurple/tests/tests.h
        libpurple/xmlnode.c pidgin/plugins/disco/gtkdisco.c
        po/ChangeLog po/POTFILES.in po/af.po po/ca.po
        po/ca at valencia.po po/cs.po po/de.po po/he.po po/nn.po
        po/pl.po po/ru.po po/sl.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head a582dd339f019301adca693df4b1a8fb135a1774)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 2804e079dabcf7bd4515349ad7b5a2c4ab7ddc7a)