pidgin: 6a300d6f: merge of '409dce18b3381a807c9f3a692d19bc...

[resiak at soc.pidgin.im]

-----------------------------------------------------------------
Revision: 6a300d6fe3972408fb6a40a314e1343d307c60bd
Ancestor: 409dce18b3381a807c9f3a692d19bc38e55ecf2b
Ancestor: 90b8f3a86dc4e3a40bee83272b9def28ae2b2602
Author: resiak at soc.pidgin.im
Date: 2008-03-13T18:06:57
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6a300d6fe3972408fb6a40a314e1343d307c60bd

Modified files:
        ChangeLog finch/gntblist.c libpurple/account.h
        libpurple/core.c libpurple/dbus-server.c libpurple/log.c
        libpurple/ntlm.c libpurple/plugins/joinpart.c
        libpurple/protocols/irc/dcc_send.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/util.c
        libpurple/protocols/silc/ops.c
        libpurple/purple-client-example.c libpurple/purple-client.c
        libpurple/request.h pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkft.c pidgin/gtkimhtml.c pidgin/gtkplugin.c
        pidgin/plugins/cap/cap.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/gevolution/new_person_dialog.c
        pidgin/plugins/spellchk.c

ChangeLog: 

merge of '409dce18b3381a807c9f3a692d19bc38e55ecf2b'
     and '90b8f3a86dc4e3a40bee83272b9def28ae2b2602'