pidgin: 2e0e8f0a: merge of 'bedd15033893c160df2e861d26520e...

Tue May 6 04:10:45 EDT 2008

-----------------------------------------------------------------
Revision: 2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf
Ancestor: bedd15033893c160df2e861d26520e1ef6afd895
Ancestor: d94973707853b3f6b84dc446eac68f7fd4c9370d
Author: markdoliner at pidgin.im
Date: 2008-05-06T08:06:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2e0e8f0a987f266a2b42fe3f59932b060fcdcdaf

Modified files:
        ChangeLog finch/gntrequest.c libpurple/protocols/irc/msgs.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 pidgin/gtknotify.c

ChangeLog: 

merge of 'bedd15033893c160df2e861d26520e1ef6afd895'
     and 'd94973707853b3f6b84dc446eac68f7fd4c9370d'