pidgin: b6b4424f: merge of '737d72b30ecbd822da19a923c20b89...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: b6b4424faed121ef1adf7ebbc9fc67161e69bf7d
Ancestor: 737d72b30ecbd822da19a923c20b8958a4d02728
Ancestor: e56cf6845a01cf20b06f80d6303da051b9566910
Author: deryni at pidgin.im
Date: 2009-03-28T02:26:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b6b4424faed121ef1adf7ebbc9fc67161e69bf7d

Deleted entries:
        libpurple/protocols/toc/Makefile.am
        libpurple/protocols/toc/Makefile.mingw
        libpurple/protocols/toc/PROTOCOL
        libpurple/protocols/toc/toc.c
Modified files:
        ChangeLog configure.ac doc/notify-signals.dox
        libpurple/desktopitem.c libpurple/nat-pmp.c libpurple/ntlm.c
        libpurple/plugins/mono/loader/debug-glue.c
        libpurple/plugins/mono/loader/mono.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/mdns_win32.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/novell/nmmessage.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/tests/test_util.c pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkroomlist.c pidgin/gtkutils.c
        pidgin/plugins/gevolution/gevolution.h pidgin/win32/untar.c
        po/POTFILES.in

ChangeLog: 

merge of '737d72b30ecbd822da19a923c20b8958a4d02728'
     and 'e56cf6845a01cf20b06f80d6303da051b9566910'