pidgin: 92c5ed95: merge of '1036d6fc1c09bf3b42c737dab42d18...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 92c5ed9599014f7db56b92520c91540fd2453431
Ancestor: 1036d6fc1c09bf3b42c737dab42d188245f16b17
Ancestor: 5f56f1df972a614a4e7186caa3dafa35b4b77ab1
Author: qulogic at pidgin.im
Date: 2008-08-01T05:16:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/92c5ed9599014f7db56b92520c91540fd2453431

Deleted entries:
        libpurple/protocols/msn/slpsession.c
        libpurple/protocols/msn/slpsession.h
Modified files:
        ChangeLog.win32 libpurple/plugins/perl/common/Prefs.xs
        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/jabber/Makefile.mingw
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/Makefile.am
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/servconn.c
        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/win32/global.mak
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/winpidgin.c

ChangeLog: 

merge of '1036d6fc1c09bf3b42c737dab42d188245f16b17'
     and '5f56f1df972a614a4e7186caa3dafa35b4b77ab1'