pidgin: 56632de6: merge of '86d7e4c199cf2a62e48fd6fe79e35e...

Thu Jun 11 01:10:37 EDT 2009

-----------------------------------------------------------------
Revision: 56632de6b750ef4678b0fa1580e8738ceb3b0133
Ancestor: 86d7e4c199cf2a62e48fd6fe79e35e3c80cc7926
Ancestor: ddd8012e657f100977759e1d1312576b04b464b9
Author: qulogic at pidgin.im
Date: 2009-06-11T05:07:15
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/56632de6b750ef4678b0fa1580e8738ceb3b0133

Modified files:
        COPYRIGHT ChangeLog libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c pidgin/eggtrayicon.c
        pidgin/gtkdocklet-x11.c pidgin/gtkft.c
        pidgin/gtkicon-theme-loader.c

ChangeLog: 

merge of '86d7e4c199cf2a62e48fd6fe79e35e3c80cc7926'
     and 'ddd8012e657f100977759e1d1312576b04b464b9'