pidgin: b93e2c96: merge of 'c65b8e669e142607d030dfb83caf2d...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: b93e2c96e0e548afd175f36159f6c39ac1cfe5ae
Ancestor: c65b8e669e142607d030dfb83caf2d344faa8dbe
Ancestor: ea6a9e8df0615d1dfebf9cf3cf547a62814c6089
Author: rekkanoryo at pidgin.im
Date: 2008-10-21T01:33:54
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b93e2c96e0e548afd175f36159f6c39ac1cfe5ae

Modified files:
        libpurple/protocols/yahoo/yahoo.h pidgin.spec.in

ChangeLog: 

merge of 'c65b8e669e142607d030dfb83caf2d344faa8dbe'
     and 'ea6a9e8df0615d1dfebf9cf3cf547a62814c6089'