pidgin: 421c57c7: merge of '062468e9e5c7b0a7d4fb51cbd78c9a...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 421c57c74fc62adb44a28e4b07943a33c5440a2c
Ancestor: 062468e9e5c7b0a7d4fb51cbd78c9a769cbd120a
Ancestor: 13f518fad2e8dacf137c733223da9b6d535c8ae1
Author: markdoliner at pidgin.im
Date: 2009-05-19T06:35:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/421c57c74fc62adb44a28e4b07943a33c5440a2c

Deleted entries:
        libpurple/protocols/yahoo/yahoo_auth.c
        libpurple/protocols/yahoo/yahoo_auth.h
        libpurple/protocols/yahoo/yahoo_crypt.c
        libpurple/protocols/yahoo/yahoo_crypt.h
Modified files:
        .mtn-ignore ChangeLog configure.ac 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/jutil.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        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/Makefile.am
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c libpurple/prpl.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: 

merge of '062468e9e5c7b0a7d4fb51cbd78c9a769cbd120a'
     and '13f518fad2e8dacf137c733223da9b6d535c8ae1'