im.pidgin.pidgin: 7fa0ba16bbd2bff9027acc0c4e408c3a9df3854b

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 7fa0ba16bbd2bff9027acc0c4e408c3a9df3854b
Ancestor: a86cc370be80c0a0f0688ae2dec4f55775779fa1
Ancestor: ab91624a6e52a9d566b2d04f6c5aa6c78d6fafba
Author: rekkanoryo at pidgin.im
Date: 2008-02-12T04:14:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7fa0ba16bbd2bff9027acc0c4e408c3a9df3854b

Modified files:
        finch/gntconv.c libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c pidgin/gtkconv.c
        pidgin/gtkprefs.c

ChangeLog: 

merge of 'a86cc370be80c0a0f0688ae2dec4f55775779fa1'
     and 'ab91624a6e52a9d566b2d04f6c5aa6c78d6fafba'