pidgin: c842962b: merge of '3eceaa6c40cc71435a27e3175ed313...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: c842962bcbd1925e652346c296a5c0e114c501db
Ancestor: 3eceaa6c40cc71435a27e3175ed313c342e01062
Ancestor: c586c7c63e038d187f56cc31c55b1e09dec584d2
Author: sadrul at pidgin.im
Date: 2009-06-20T21:44:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c842962bcbd1925e652346c296a5c0e114c501db

Modified files:
        finch/plugins/gnthistory.c libpurple/connection.c
        libpurple/connection.h libpurple/network.c
        libpurple/notify.h libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h

ChangeLog: 

merge of '3eceaa6c40cc71435a27e3175ed313c342e01062'
     and 'c586c7c63e038d187f56cc31c55b1e09dec584d2'