pidgin: 3acf6d93: merge of '6404d7635dd48f315b3c8fd3550970...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 3acf6d9387524fb3b59c35e5e1db2847387c37af
Ancestor: 6404d7635dd48f315b3c8fd3550970a417daa2ef
Ancestor: 97fa95e12dee764fb786a1cb1b06c7c259bfda48
Author: khc at pidgin.im
Date: 2008-08-27T03:06:42
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/3acf6d9387524fb3b59c35e5e1db2847387c37af

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

ChangeLog: 

merge of '6404d7635dd48f315b3c8fd3550970a417daa2ef'
     and '97fa95e12dee764fb786a1cb1b06c7c259bfda48'