pidgin: 0c9dafd4: merge of '14f8b4609456592014383ef4957124...

Sat Aug 9 00:30:57 EDT 2008

-----------------------------------------------------------------
Revision: 0c9dafd42a9975139f059cd2112c8db91b58bae6
Ancestor: 14f8b4609456592014383ef4957124a07f57ac3a
Ancestor: 79758530b2d043ca03126b97fdcf3f5b004fb3f1
Author: qulogic at pidgin.im
Date: 2008-08-09T04:25:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0c9dafd42a9975139f059cd2112c8db91b58bae6

Added files:
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png
Modified files:
        COPYRIGHT ChangeLog.API libpurple/certificate.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c libpurple/upnp.c
        libpurple/util.c libpurple/util.h
Modified attrs:
        pidgin/pixmaps/protocols/16/facebook.png
        pidgin/pixmaps/protocols/22/facebook.png
        pidgin/pixmaps/protocols/48/facebook.png

ChangeLog: 

merge of '14f8b4609456592014383ef4957124a07f57ac3a'
     and '79758530b2d043ca03126b97fdcf3f5b004fb3f1'