pidgin: a53078a1: merge of '69e3f1859964483e117264088d4b6f...

[maiku at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a53078a1ec59ed925fe780058384b1ad7005590b
Ancestor: 69e3f1859964483e117264088d4b6fc214709f6a
Ancestor: b66da85de52dbcd99da3c6571add291b12b427ea
Author: maiku at soc.pidgin.im
Date: 2009-07-31T04:21:30
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a53078a1ec59ed925fe780058384b1ad7005590b

Added files:
        libpurple/tests/test_yahoo_util.c
        share/ca-certs/Thawte_Premium_Server_CA.pem
Modified files:
        COPYRIGHT Makefile.mingw libpurple/certificate.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c libpurple/tests/tests.h
        pidgin/win32/nsis/pidgin-installer.nsi po/ca at valencia.po
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '69e3f1859964483e117264088d4b6fc214709f6a'
     and 'b66da85de52dbcd99da3c6571add291b12b427ea'