pidgin: 8f4891ac: merge of '72b4eba9246c31efe0760a9e5d1eeb...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8f4891ac56c731fcea111c7f063451fca9eced8b
Ancestor: 72b4eba9246c31efe0760a9e5d1eeb0f87da2867
Ancestor: e56cf6845a01cf20b06f80d6303da051b9566910
Author: qulogic at pidgin.im
Date: 2009-03-28T04:35:24
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8f4891ac56c731fcea111c7f063451fca9eced8b

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 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/jabber/buddy.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/novell/nmmessage.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_list.c pidgin/gtkroomlist.c
        pidgin/gtkutils.c pidgin/win32/untar.c po/POTFILES.in

ChangeLog: 

merge of '72b4eba9246c31efe0760a9e5d1eeb0f87da2867'
     and 'e56cf6845a01cf20b06f80d6303da051b9566910'