pidgin: 4c0f666d: merge of '0cb5b3f2ca9b11063ea0e18c4fc723...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 4c0f666db56b090ce18cd514088313be1529e6f0
Ancestor: 0cb5b3f2ca9b11063ea0e18c4fc723568e254965
Ancestor: 277dc5f3802ba0f69d4da513bdea94b9973126bd
Author: darkrain42 at pidgin.im
Date: 2009-07-26T17:43:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4c0f666db56b090ce18cd514088313be1529e6f0

Modified files:
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_doodle.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/yahoochat.h
        libpurple/protocols/yahoo/ycht.c po/ca.po

ChangeLog: 

merge of '0cb5b3f2ca9b11063ea0e18c4fc723568e254965'
     and '277dc5f3802ba0f69d4da513bdea94b9973126bd'