pidgin: c2cd726c: merge of '899182ae412c1d58eab5efb5001e98...

Mon Oct 12 16:26:41 EDT 2009

-----------------------------------------------------------------
Revision: c2cd726c5225664720357cbe316631e320505431
Ancestor: 899182ae412c1d58eab5efb5001e980fdfda4190
Ancestor: 9afa0cfda64ff9907b43b21fe64f17f698d2aa0d
Author: qulogic at pidgin.im
Date: 2009-10-12T20:23:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c2cd726c5225664720357cbe316631e320505431

Modified files:
        ChangeLog configure.ac libpurple/certificate.c
        libpurple/ft.c libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h

ChangeLog: 

merge of '899182ae412c1d58eab5efb5001e980fdfda4190'
     and '9afa0cfda64ff9907b43b21fe64f17f698d2aa0d'