soc.2008.finch: a5d0e8ad: merge of '2c332e1e9d96329ffcdb1e030b45ca...

[queueram at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a5d0e8adf55a91083e49fb5c2438385ccea8b95d
Ancestor: 2c332e1e9d96329ffcdb1e030b45ca667a910675
Ancestor: 40da57129e2ff1f829079cdcc67ecef34c499c28
Author: queueram at soc.pidgin.im
Date: 2008-08-20T04:30:06
Branch: im.pidgin.soc.2008.finch
URL: http://d.pidgin.im/viewmtn/revision/info/a5d0e8adf55a91083e49fb5c2438385ccea8b95d

Deleted entries:
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
Renamed entries:
        libpurple/protocols/msn/soap2.c to libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap2.h to libpurple/protocols/msn/soap.h
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/connection-signals.dox finch/gntconv.c
        finch/libgnt/wms/tiling.c libpurple/cipher.c
        libpurple/core.c libpurple/plugin.h
        libpurple/plugins/autoaccept.c
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/irc.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/command.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/oim.c libpurple/protocols/msn/oim.h
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpsession.c
        libpurple/protocols/msn/slpsession.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/sync.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/oscar/oscar.c libpurple/util.c
        libpurple/util.h libpurple/xmlnode.c pidgin/gtkdocklet.c
        po/de.po

ChangeLog: 

merge of '2c332e1e9d96329ffcdb1e030b45ca667a910675'
     and '40da57129e2ff1f829079cdcc67ecef34c499c28'