pidgin: d2e45606: merge of '8ef03a3edef528af90c03195f4225c...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: d2e4560619da68f5b4346dcf1247908d88f39eb3
Ancestor: 8ef03a3edef528af90c03195f4225c8ee97214fd
Ancestor: e56d7c10f8cc1dc7085e856b4028be46df81d9bd
Author: sadrul at pidgin.im
Date: 2008-07-13T10:09:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d2e4560619da68f5b4346dcf1247908d88f39eb3

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:
        ChangeLog ChangeLog.API configure.ac finch/gntconv.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/msn/Makefile.am
        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/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/xmlnode.c
        po/de.po

ChangeLog: 

merge of '8ef03a3edef528af90c03195f4225c8ee97214fd'
     and 'e56d7c10f8cc1dc7085e856b4028be46df81d9bd'