pidgin: 0af807a7: merge of '60c9671daa2b521f9de4c0980f8798...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 0af807a7e78cef62c5b06799957f1a287047c0dd
Ancestor: 60c9671daa2b521f9de4c0980f8798876959570e
Ancestor: 78026d85fc783da9d0cb93283729d22e5248c42b
Author: qulogic at pidgin.im
Date: 2010-03-10T05:12:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0af807a7e78cef62c5b06799957f1a287047c0dd

Deleted entries:
        libpurple/protocols/msnp9
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/cmdproc.h
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/command.h
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/dialog.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/directconn.h
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/error.h
        libpurple/protocols/msnp9/group.c
        libpurple/protocols/msnp9/group.h
        libpurple/protocols/msnp9/history.c
        libpurple/protocols/msnp9/history.h
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/httpconn.h
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msg.h
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/msn-utils.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/nexus.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/page.c
        libpurple/protocols/msnp9/page.h
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/servconn.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slp.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/slplink.h
        libpurple/protocols/msnp9/slpmsg.c
        libpurple/protocols/msnp9/slpmsg.h
        libpurple/protocols/msnp9/slpsession.c
        libpurple/protocols/msnp9/slpsession.h
        libpurple/protocols/msnp9/state.c
        libpurple/protocols/msnp9/state.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/sync.h
        libpurple/protocols/msnp9/table.c
        libpurple/protocols/msnp9/table.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/transaction.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/msnp9/userlist.h
Modified files:
        ChangeLog configure.ac libpurple/protocols/Makefile.am
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h

ChangeLog: 

merge of '60c9671daa2b521f9de4c0980f8798876959570e'
     and '78026d85fc783da9d0cb93283729d22e5248c42b'