cpw.darkrain42.2.6.1: 6756026d: propagate from branch 'im.pidgin.pidgin'...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 6756026db7b43afd86a873113d2d9b18c38d434c
Ancestor: 7313bb3a50bfb81413f4fb007c26df5836a97397
Ancestor: 7c0f8ebeda0f59bd50e8e1692886616f302badcf
Author: darkrain42 at pidgin.im
Date: 2009-07-22T04:15:09
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/6756026db7b43afd86a873113d2d9b18c38d434c

Modified files:
        libpurple/blist.c libpurple/certificate.c libpurple/ft.c
        libpurple/mediamanager.c libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/win32/targets.mak pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkmedia.c po/ChangeLog po/de.po
        po/nl.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7c0f8ebeda0f59bd50e8e1692886616f302badcf)
            to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 7313bb3a50bfb81413f4fb007c26df5836a97397)