pidgin: ccaf87b9: merge of '0d858a8978355a1e8b7305b64b87db...

[elb at pidgin.im]

-----------------------------------------------------------------
Revision: ccaf87b9b0b8afb03ed23700d2086a121e70be93
Ancestor: 0d858a8978355a1e8b7305b64b87db51e44e9978
Ancestor: 4837767868c0defe45efc50e8d0639be2ed4ad7d
Author: elb at pidgin.im
Date: 2008-08-01T19:45:08
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/ccaf87b9b0b8afb03ed23700d2086a121e70be93

Deleted entries:
        libpurple/protocols/msn/slpsession.c
        libpurple/protocols/msn/slpsession.h
Modified files:
        AUTHORS ChangeLog ChangeLog.win32 doc/pidgin.1.in
        libpurple/plugins/perl/Makefile.mingw
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/common/Prefs.xs
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c
        libpurple/plugins/perl/perl-handlers.h
        libpurple/plugins/perl/perl.c
        libpurple/plugins/perl/scripts/plugin_pref.pl
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/soap.c
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h libpurple/win32/global.mak
        pidgin/gtkdialogs.c pidgin/gtkroomlist.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/winpidgin.c po/zh_CN.po po/zh_TW.po

ChangeLog: 

merge of '0d858a8978355a1e8b7305b64b87db51e44e9978'
     and '4837767868c0defe45efc50e8d0639be2ed4ad7d'