pidgin: 9454e996: merge of '679b95c6b80b4045e5c2ded165e64f...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 9454e996bc115378731f77d0539eeebe96bd539d
Ancestor: 679b95c6b80b4045e5c2ded165e64f4fca5f1ed8
Ancestor: bf66b180637244cbeca51a2a0f48addef4514cd9
Author: qulogic at pidgin.im
Date: 2009-01-29T03:53:12
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9454e996bc115378731f77d0539eeebe96bd539d

Modified files:
        ChangeLog finch/libgnt/gntcolors.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '679b95c6b80b4045e5c2ded165e64f4fca5f1ed8'
     and 'bf66b180637244cbeca51a2a0f48addef4514cd9'