pidgin: 6a640937: propagate from branch 'im.pidgin.cpw.sul...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 6a6409370fa50e23bc8fdedcef230220fa680a36
Ancestor: 86a698e26bedb5017a143cb8cfeefd9c5bda7beb
Ancestor: dcd01209d8af5268ac18d8f55577aadc4b1c1179
Author: darkrain42 at pidgin.im
Date: 2009-05-17T21:49:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6a6409370fa50e23bc8fdedcef230220fa680a36

Modified files:
        .mtn-ignore ChangeLog libpurple/account.c libpurple/blist.c
        libpurple/dnsquery.c libpurple/network.c
        libpurple/plugins/perl/perl-handlers.c libpurple/prefs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/soap.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/utils.c
        libpurple/protocols/yahoo/yahoo.h libpurple/savedstatuses.c
        libpurple/util.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h pidgin/gtkstatusbox.c
        po/ca.po po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.cpw.sulabh.yahoo_16' (head 86a698e26bedb5017a143cb8cfeefd9c5bda7beb)
            to branch 'im.pidgin.pidgin' (head dcd01209d8af5268ac18d8f55577aadc4b1c1179)


Whoops