pidgin: a6091607: merge of '881df138362222308d7b078687b757...

[khc at pidgin.im]

-----------------------------------------------------------------
Revision: a609160715ae18beed98b084aac19bc0f6551362
Ancestor: 881df138362222308d7b078687b7576861609e9c
Ancestor: f71e0a5c7eff9c53c7641ad6c6b135a3dfec040f
Author: khc at pidgin.im
Date: 2009-04-01T03:36:58
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a609160715ae18beed98b084aac19bc0f6551362

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/account-signals.dox
        libpurple/desktopitem.c libpurple/ntlm.c
        libpurple/plugins/mono/loader/debug-glue.c
        libpurple/plugins/mono/loader/mono.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/irc/irc.h libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/xdata.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/novell/nmmessage.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/buddy_list.c
        libpurple/tests/test_util.c pidgin/gtkroomlist.c
        pidgin/gtkutils.c pidgin/win32/untar.c po/POTFILES.in
        po/de.po

ChangeLog: 

merge of '881df138362222308d7b078687b7576861609e9c'
     and 'f71e0a5c7eff9c53c7641ad6c6b135a3dfec040f'