im.pidgin.pidgin: 38f9a3189979905bf69cbbc5640138ad2c7618ca

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 38f9a3189979905bf69cbbc5640138ad2c7618ca
Ancestor: 1858be5916da7bce36f3c991bcd71fc65271048d
Ancestor: ac2c6e65f96647a279e527fb82e4ba051f17aa93
Author: sadrul at pidgin.im
Date: 2008-01-05T10:45:29
Branch: im.pidgin.pidgin

Modified files:
        ChangeLog ChangeLog.API
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkprefs.c pidgin/gtkprivacy.c
        pidgin/gtkroomlist.c pidgin/gtksavedstatuses.c
        pidgin/gtkutils.c pidgin/gtkutils.h

ChangeLog: 

merge of '1858be5916da7bce36f3c991bcd71fc65271048d'
     and 'ac2c6e65f96647a279e527fb82e4ba051f17aa93'