pidgin: 382916ff: merge of '0800f09f6994e5ae06fed4644a78d3...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 382916ff7d78e3641f26a361778ff8808755e03f
Ancestor: 0800f09f6994e5ae06fed4644a78d33ab4346866
Ancestor: 3e47f0f65ae33e37ab711ec7b2fd8aeeae1efcd7
Author: darkrain42 at pidgin.im
Date: 2009-07-15T04:27:22
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/382916ff7d78e3641f26a361778ff8808755e03f

Modified files:
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h

ChangeLog: 

merge of '0800f09f6994e5ae06fed4644a78d33ab4346866'
     and '3e47f0f65ae33e37ab711ec7b2fd8aeeae1efcd7'