pidgin: cce9dfe2: merge of '02d1b6e1b18a057f6dc1f4698d85c8...

Tue May 6 22:50:43 EDT 2008

-----------------------------------------------------------------
Revision: cce9dfe291731b6645ed3a637f1cf895cdeb57f3
Ancestor: 02d1b6e1b18a057f6dc1f4698d85c8cd005f3bbc
Ancestor: 2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf
Author: rlaager at pidgin.im
Date: 2008-05-07T02:45:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/cce9dfe291731b6645ed3a637f1cf895cdeb57f3

Modified files:
        finch/gntrequest.c finch/libgnt/gntwm.c
        libpurple/protocols/oscar/family_admin.c
        libpurple/protocols/oscar/family_bart.c
        libpurple/protocols/oscar/family_chat.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/family_odir.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/family_userlookup.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '02d1b6e1b18a057f6dc1f4698d85c8cd005f3bbc'
     and '2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf'