pidgin: e25c2c73: merge of '3acf6d9387524fb3b59c35e5e1db28...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: e25c2c739ad8e544bc841cd6a8d7004ddd61a1a5
Ancestor: 3acf6d9387524fb3b59c35e5e1db2847387c37af
Ancestor: 5d5313fdfd6fdadba37ba06101fff9174cb2e568
Author: khc at pidgin.im
Date: 2008-08-27T03:06:44
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e25c2c739ad8e544bc841cd6a8d7004ddd61a1a5

Deleted entries:
        share/ca-certs/Microsoft_Internet_Authority.pem
Added files:
        share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
Modified files:
        libpurple/certificate.c libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c libpurple/util.c
        share/ca-certs/Makefile.am
        share/ca-certs/Microsoft_Secure_Server_Authority.pem

ChangeLog: 

merge of '3acf6d9387524fb3b59c35e5e1db2847387c37af'
     and '5d5313fdfd6fdadba37ba06101fff9174cb2e568'