pidgin: 7aa70485: explicit merge of 'c273f8da9712cac21aae5...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 7aa70485002618c0d25120a152aec4f6a3b74ccf
Ancestor: a90257133c31b066ad5d8e9df4fada3a482ccd82
Ancestor: c273f8da9712cac21aae5bcbd3d4790f8ee78f79
Author: darkrain42 at pidgin.im
Date: 2009-07-16T20:06:27
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7aa70485002618c0d25120a152aec4f6a3b74ccf

Added files:
        share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem
        share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem
Modified files:
        ChangeLog ChangeLog.API configure.ac finch/gntconv.c
        finch/gntrequest.c finch/plugins/Makefile.am
        libpurple/blist.c libpurple/buddyicon.c
        libpurple/certificate.c libpurple/plugins/Makefile.am
        libpurple/plugins/ssl/ssl-nss.c libpurple/prefs.h
        libpurple/privacy.h libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/Makefile.am
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/yahoo/Makefile.am
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoochat.c libpurple/prpl.c
        libpurple/server.c libpurple/sslconn.c libpurple/sslconn.h
        libpurple/status.c libpurple/tests/test_jabber_jutil.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdialogs.c
        pidgin/gtkutils.c pidgin/plugins/Makefile.am
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/fi.po
        po/fr.po po/nn.po po/ru.po po/sv.po
        share/ca-certs/Makefile.am

ChangeLog: 

explicit merge of 'c273f8da9712cac21aae5bcbd3d4790f8ee78f79'
              and 'a90257133c31b066ad5d8e9df4fada3a482ccd82'