cpw.darkrain42.2.6.1: 625ec18a: propagate from branch 'im.pidgin.pidgin'...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 625ec18a824e84da8f5d20d9c290aaada70fa1a3
Ancestor: 8d947435c8179d35142622b152f22e6daea1dfd6
Ancestor: fa041ec42ae016bc51230865d59a5e06676f3cec
Author: darkrain42 at pidgin.im
Date: 2009-07-31T06:35:49
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/625ec18a824e84da8f5d20d9c290aaada70fa1a3

Modified files:
        finch/gntmedia.c libpurple/certificate.c libpurple/ft.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/libymsg.c pidgin/gtkconv.c
        pidgin/gtkmedia.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head fa041ec42ae016bc51230865d59a5e06676f3cec)
            to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 8d947435c8179d35142622b152f22e6daea1dfd6)