pidgin: f26473a7: merge of '33ac448c0d0fbe2bd41ad24c9d2e8f...

Thu Oct 15 21:31:56 EDT 2009

-----------------------------------------------------------------
Revision: f26473a70f05df45b0d951440a3357222dd82b5a
Ancestor: 33ac448c0d0fbe2bd41ad24c9d2e8faa14fafa69
Ancestor: 8868b966ec81185b033adaf17af1a06143d2edb1
Author: darkrain42 at pidgin.im
Date: 2009-10-16T01:27:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f26473a70f05df45b0d951440a3357222dd82b5a

Modified files:
        ChangeLog libpurple/ft.h libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h

ChangeLog: 

merge of '33ac448c0d0fbe2bd41ad24c9d2e8faa14fafa69'
     and '8868b966ec81185b033adaf17af1a06143d2edb1'