pidgin: 36c2bf4a: merge of '1ba8fbd2ac54a6b25df759681a854c...

[evands at pidgin.im]

-----------------------------------------------------------------
Revision: 36c2bf4a9a6fedddf5d46c0c0cd993773eafb577
Ancestor: 1ba8fbd2ac54a6b25df759681a854ccc43e6abff
Ancestor: a4c67ebda7af92f03a3da8f978c16b2a4e6d0891
Author: evands at pidgin.im
Date: 2008-03-11T23:00:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/36c2bf4a9a6fedddf5d46c0c0cd993773eafb577

Modified files:
        libpurple/account.h libpurple/ntlm.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/util.c libpurple/request.h
        pidgin/gtkft.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '1ba8fbd2ac54a6b25df759681a854ccc43e6abff'
     and 'a4c67ebda7af92f03a3da8f978c16b2a4e6d0891'