adium: 5047e714: propagate from branch 'im.pidgin.pidgin'...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 5047e7147b3c9ae124f94a3be8128d3938923d1b
Ancestor: 588f7d1b621540280ffc8757b9d5f533a5b8586a
Ancestor: caf1ac283a4ee4be662ae40717b7d7104f76296d
Author: darkrain42 at pidgin.im
Date: 2009-06-12T21:27:20
Branch: im.pidgin.adium
URL: http://d.pidgin.im/viewmtn/revision/info/5047e7147b3c9ae124f94a3be8128d3938923d1b

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
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/disco/xmppdisco.h
Added directories:
        libpurple/protocols/facebook pidgin/plugins/disco
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API NEWS configure.ac
        finch/finch.c libpurple/Makefile.am libpurple/account.c
        libpurple/blist.c libpurple/conversation.c
        libpurple/conversation.h libpurple/core.h libpurple/media.c
        libpurple/plugins/psychic.c libpurple/plugins/signals-test.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/buddylist.h
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/server.c libpurple/theme.c
        libpurple/util.c libpurple/util.h pidgin/eggtrayicon.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkdocklet-x11.c pidgin/gtkft.c
        pidgin/gtkicon-theme-loader.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkprefs.c
        pidgin/gtksmiley.c pidgin/gtksmiley.h pidgin/gtkutils.c
        pidgin/pidginstock.c pidgin/plugins/Makefile.am
        pidgin/plugins/convcolors.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/xmppconsole.c
        po/POTFILES.in po/ca.po po/de.po
Modified attrs:
        libpurple/protocols/facebook/facebook16.png
        libpurple/protocols/facebook/facebook22.png
        libpurple/protocols/facebook/facebook48.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head caf1ac283a4ee4be662ae40717b7d7104f76296d)
            to branch 'im.pidgin.adium' (head 588f7d1b621540280ffc8757b9d5f533a5b8586a)


Requested by Zac because FileMerge doesn't work