pidgin: e342d10b: merge of '3abad7606f4a2dfd1903df796f3392...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: e342d10b415f6261ea20d408d825bc2603dc2e66
Ancestor: 3abad7606f4a2dfd1903df796f33924b12509a56
Ancestor: a75276ac556cbbbde137203f6e38e37e3c7c4062
Author: sadrul at pidgin.im
Date: 2009-10-12T08:27:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e342d10b415f6261ea20d408d825bc2603dc2e66

Modified files:
        ChangeLog libpurple/ft.c libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h

ChangeLog: 

merge of '3abad7606f4a2dfd1903df796f33924b12509a56'
     and 'a75276ac556cbbbde137203f6e38e37e3c7c4062'