pidgin: 1ef58f8d: merge of '126251205c0faf12cb73ec60a10f1c...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: 1ef58f8d4eed57be3447aa663ae1d2e32d74ce29
Ancestor: 126251205c0faf12cb73ec60a10f1cf904b8166d
Ancestor: e25c2c739ad8e544bc841cd6a8d7004ddd61a1a5
Author: khc at pidgin.im
Date: 2008-08-27T04:52:40
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/1ef58f8d4eed57be3447aa663ae1d2e32d74ce29

Modified files:
        libpurple/protocols/msn/notification.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

ChangeLog: 

merge of '126251205c0faf12cb73ec60a10f1cf904b8166d'
     and 'e25c2c739ad8e544bc841cd6a8d7004ddd61a1a5'