pidgin: 6be4a11c: merge of 'ac789033b0d69b98d5985567ad5d35...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 6be4a11c3e1bf403bbb6e1a7a754e4b99e7d9a44
Ancestor: ac789033b0d69b98d5985567ad5d3579bde9af12
Ancestor: cce9dfe291731b6645ed3a637f1cf895cdeb57f3
Author: sadrul at pidgin.im
Date: 2008-05-07T02:53:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6be4a11c3e1bf403bbb6e1a7a754e4b99e7d9a44

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
        libpurple/protocols/silc/chat.c
        libpurple/protocols/silc10/chat.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtknotify.c

ChangeLog: 

merge of 'ac789033b0d69b98d5985567ad5d3579bde9af12'
     and 'cce9dfe291731b6645ed3a637f1cf895cdeb57f3'