pidgin: 3a57e988: merge of '2ce8248c9604e667e6fbbc42005654...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 3a57e988ed2405cd3ee0bb807bee3d0cd5a26f5d
Ancestor: 2ce8248c9604e667e6fbbc4200565415369417e0
Ancestor: 826fe96cf74adec56a74a298023c17a9eece9c8b
Author: qulogic at pidgin.im
Date: 2009-07-19T08:17:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3a57e988ed2405cd3ee0bb807bee3d0cd5a26f5d

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 configure.ac finch/finch.c finch/finch.h
        finch/gntaccount.c finch/gntblist.c finch/gntcertmgr.c
        finch/gntconn.c finch/gntconv.c finch/gntdebug.c
        finch/gntft.c finch/gntlog.c finch/gntnotify.c
        finch/gntplugin.c finch/gntpounce.c finch/gntprefs.c
        finch/gntrequest.c finch/gntroomlist.c finch/gntsound.c
        finch/gntstatus.c finch/gntui.c libpurple/blist.c
        libpurple/plugin.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/msg.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/tests/test_jabber_jutil.c libpurple/util.c
        libpurple/win32/libc_internal.h pidgin/gtkblist.c
        pidgin/plugins/notify.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/el.po
        po/fi.po po/fr.po po/gl.po po/pa.po
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '2ce8248c9604e667e6fbbc4200565415369417e0'
     and '826fe96cf74adec56a74a298023c17a9eece9c8b'