pidgin: 96fc49b5: merge of '67e253d9bff41f028ffc609c776f70...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 96fc49b5da18a0e87d5d8e5976ce7b6abd15bad3
Ancestor: 67e253d9bff41f028ffc609c776f70dae52b614b
Ancestor: ff9044771e996cfc4b88e228d53ac790086251fc
Author: deryni at pidgin.im
Date: 2009-06-25T05:38:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/96fc49b5da18a0e87d5d8e5976ce7b6abd15bad3

Added files:
        libpurple/protocols/oscar/clientlogin.c
        pidgin/plugins/disco/Makefile.mingw
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac doc/notify-signals.dox
        finch/plugins/gnthistory.c libpurple/account.c
        libpurple/buddyicon.h libpurple/cipher.c
        libpurple/connection.h libpurple/log.c libpurple/notify.h
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/perl/Makefile.am
        libpurple/plugins/perl/common/Makefile.PL.in
        libpurple/plugins/perl/perl.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c libpurple/purple-remote
        libpurple/util.c libpurple/xmlnode.c libpurple/xmlnode.h
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkimhtml.c pidgin/gtkprefs.c pidgin/gtkstatusbox.c
        pidgin/plugins/Makefile.mingw
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/perl/Makefile.am
        pidgin/plugins/perl/common/Makefile.PL.in
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

merge of '67e253d9bff41f028ffc609c776f70dae52b614b'
     and 'ff9044771e996cfc4b88e228d53ac790086251fc'