cpw.malu.xmpp.ibb_ft: f595301f: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: f595301f7175800c4e04b36cace91a9061db5724
Ancestor: 1004ee62a91cd7c1f39c9d5aafdbe4de761879b0
Ancestor: b14102a6c681b35084d2c3f7726de34d4f859fe1
Author: malu at pidgin.im
Date: 2008-09-13T23:25:34
Branch: im.pidgin.cpw.malu.xmpp.ibb_ft
URL: http://d.pidgin.im/viewmtn/revision/info/f595301f7175800c4e04b36cace91a9061db5724

Added files:
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
Modified files:
        libpurple/plugins/autoaccept.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h pidgin/gtkprefs.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head b14102a6c681b35084d2c3f7726de34d4f859fe1)
            to branch 'im.pidgin.cpw.malu.xmpp.ibb_ft' (head 1004ee62a91cd7c1f39c9d5aafdbe4de761879b0)