cpw.darkrain42.2.6.1: 3100186c: propagate from branch 'im.pidgin.pidgin'...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 3100186c018974c8e9a25d886213b3317320c5c7
Ancestor: 0e467725740268650f924a56ea776122abfffb67
Ancestor: 1876e80a840aa8045b1a49c60049781e0d285558
Author: darkrain42 at pidgin.im
Date: 2009-08-03T00:46:28
Branch: im.pidgin.cpw.darkrain42.2.6.1
URL: http://d.pidgin.im/viewmtn/revision/info/3100186c018974c8e9a25d886213b3317320c5c7

Modified files:
        ChangeLog finch/gntmedia.c libpurple/certificate.c
        libpurple/cipher.c libpurple/desktopitem.c libpurple/ft.c
        libpurple/plugins/joinpart.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/zephyr/internal.h libpurple/signals.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkimhtml.c pidgin/gtkmedia.c pidgin/gtkprefs.c
        pidgin/gtkthemes.c pidgin/plugins/crazychat/glm.c
        po/ChangeLog po/eu.po po/ru.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 1876e80a840aa8045b1a49c60049781e0d285558)
            to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 0e467725740268650f924a56ea776122abfffb67)