pidgin: 50f8b502: merge of '466f38a98b4f03139b06e14b4528e0...

Wed Apr 7 23:26:06 EDT 2010

-----------------------------------------------------------------
Revision: 50f8b5029615ef7f34813221c1194d6eef1ef421
Ancestor: 466f38a98b4f03139b06e14b4528e0489a2f0bce
Ancestor: 919b4430c2e8ef456651ed7a88d4ee34e736c92c
Author: rekkanoryo at pidgin.im
Date: 2010-04-08T03:22:01
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/50f8b5029615ef7f34813221c1194d6eef1ef421

Modified files:
        libpurple/ft.c libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oft.c
        libpurple/protocols/oscar/peer.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h

ChangeLog: 

merge of '466f38a98b4f03139b06e14b4528e0489a2f0bce'
     and '919b4430c2e8ef456651ed7a88d4ee34e736c92c'