adium.1-3: 786af5f8: merge of '38bca5dc70ae9a5a234fcb2c1bbe32...

[zacw at adiumx.com]

-----------------------------------------------------------------
Revision: 786af5f8ca099174b85c8480428202d8fea1cd5e
Ancestor: 38bca5dc70ae9a5a234fcb2c1bbe32b29968c588
Ancestor: ee46f925949e31452dbc1fa0734bcc960346f2bf
Author: zacw at adiumx.com
Date: 2009-06-21T00:19:29
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/786af5f8ca099174b85c8480428202d8fea1cd5e

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:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac libpurple/protocols/facebook/facebook.nsi
        libpurple/protocols/facebook/fb_blist.c
        libpurple/protocols/facebook/fb_connection.c
        libpurple/protocols/facebook/fb_messages.c
        libpurple/protocols/facebook/fb_messages.h
        libpurple/protocols/facebook/fb_notifications.c
        libpurple/protocols/facebook/libfacebook.c
        libpurple/protocols/facebook/libfacebook.h
        libpurple/protocols/facebook/pidgin-facebookchat.rc
        libpurple/protocols/facebook/rss.xml
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/util.c
        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_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c libpurple/util.c
        po/ChangeLog

ChangeLog: 

merge of '38bca5dc70ae9a5a234fcb2c1bbe32b29968c588'
     and 'ee46f925949e31452dbc1fa0734bcc960346f2bf'