cpw.malu.xmpp.jingle_ft: 8e0efb9c: merge of '0e2609c58103bd836f19ef309bbc6f...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 8e0efb9c6fc13e7298e594f80e8d646a6f7716b8
Ancestor: 0e2609c58103bd836f19ef309bbc6f07a9cb3e03
Ancestor: 506e8b5bf584269937e052d01ab971948177d95e
Author: malu at pidgin.im
Date: 2010-05-06T20:45:48
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/8e0efb9c6fc13e7298e594f80e8d646a6f7716b8

Modified files:
        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/si.c
        libpurple/protocols/jabber/socks5.c
        libpurple/protocols/jabber/socks5.h

ChangeLog: 

merge of '0e2609c58103bd836f19ef309bbc6f07a9cb3e03'
     and '506e8b5bf584269937e052d01ab971948177d95e'