adium.1-3: 9f01c862: explicit merge of 'f29c90f0da72e27c601fd...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 9f01c862b0f46e33311b5b8e990bc2bf259a9ece
Ancestor: bbbd25f286d111e416097e8e9d1a238d33d8ed65
Ancestor: f29c90f0da72e27c601fd8c4e1aff2a250a52473
Author: evands at pidgin.im
Date: 2009-04-13T19:54:06
Branch: im.pidgin.adium.1-3
URL: http://d.pidgin.im/viewmtn/revision/info/9f01c862b0f46e33311b5b8e990bc2bf259a9ece

Added files:
        libpurple/protocols/facebook/COPYING
        libpurple/protocols/facebook/COPYRIGHT
        libpurple/protocols/facebook/Makefile.am
        libpurple/protocols/facebook/facebook.nsi
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png
        libpurple/protocols/facebook/fb_blist.c
        libpurple/protocols/facebook/fb_blist.h
        libpurple/protocols/facebook/fb_connection.c
        libpurple/protocols/facebook/fb_connection.h
        libpurple/protocols/facebook/fb_info.c
        libpurple/protocols/facebook/fb_info.h
        libpurple/protocols/facebook/fb_managefriends.c
        libpurple/protocols/facebook/fb_managefriends.h
        libpurple/protocols/facebook/fb_messages.c
        libpurple/protocols/facebook/fb_messages.h
        libpurple/protocols/facebook/fb_notifications.c
        libpurple/protocols/facebook/fb_notifications.h
        libpurple/protocols/facebook/fb_search.c
        libpurple/protocols/facebook/fb_search.h
        libpurple/protocols/facebook/libfacebook.c
        libpurple/protocols/facebook/libfacebook.h
        libpurple/protocols/facebook/login.facebook.com.pem
        libpurple/protocols/facebook/pidgin-facebookchat.rc
        libpurple/protocols/facebook/rss.xml
        libpurple/protocols/qq/buddy_memo.c
        libpurple/protocols/qq/buddy_memo.h po/km.po
        share/ca-certs/AOL_Member_CA.pem
        share/ca-certs/America_Online_Root_Certification_Authority_1.pem
Added directories:
        libpurple/protocols/facebook
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        NEWS configure.ac libpurple/Makefile.am libpurple/account.h
        libpurple/blist.c libpurple/plugin.h
        libpurple/plugins/ssl/ssl-gnutls.c libpurple/prefs.h
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/bonjour.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/qq/AUTHORS
        libpurple/protocols/qq/ChangeLog
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/Makefile.mingw
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_info.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_list.h
        libpurple/protocols/qq/group_info.c
        libpurple/protocols/qq/group_info.h
        libpurple/protocols/qq/im.c libpurple/protocols/qq/qq.c
        libpurple/protocols/qq/qq.h
        libpurple/protocols/qq/qq_define.c
        libpurple/protocols/qq/qq_define.h
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_network.h
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/qq_process.h
        libpurple/protocols/qq/qq_trans.c
        libpurple/protocols/qq/qq_trans.h libpurple/purple-remote
        libpurple/sslconn.h libpurple/version.h.in
        libpurple/xmlnode.c pidgin/gtkblist.h pidgin/gtkdialogs.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/af.po po/bn.po po/ca.po po/cs.po po/da.po
        po/de.po po/fr.po po/hu.po po/lt.po po/nb.po po/nn.po
        po/pa.po po/pt_BR.po po/ru.po po/sk.po po/sl.po po/sr.po
        po/sr at latin.po po/sv.po po/zh_HK.po po/zh_TW.po
        share/ca-certs/Makefile.am
Modified attrs:
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png
        pidgin/pixmaps/art-tools/clean-svg-definitions.sh

ChangeLog: 

explicit merge of 'f29c90f0da72e27c601fd8c4e1aff2a250a52473'
              and 'bbbd25f286d111e416097e8e9d1a238d33d8ed65'