cpw.malu.xmpp.jingle_ft: 606bb3c4: merge of '5fd231746d8c372a4c5b502400a2d4...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 606bb3c467882406793a8062546fb8177b3ae492
Ancestor: 5fd231746d8c372a4c5b502400a2d4c1db675df1
Ancestor: 6aa2aea0aca1c1ebba798176e4b69b4cf5b0ff97
Author: malu at pidgin.im
Date: 2009-05-07T20:31:07
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/606bb3c467882406793a8062546fb8177b3ae492

Modified files:
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/s5b.c

ChangeLog: 

merge of '5fd231746d8c372a4c5b502400a2d4c1db675df1'
     and '6aa2aea0aca1c1ebba798176e4b69b4cf5b0ff97'