pidgin: aeccaeff: merge of '1356d70e521b4cb5ab8ea10f092706...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: aeccaeff23a7b1b719d2b0c30b86b85b2d1effab
Ancestor: 1356d70e521b4cb5ab8ea10f0927063b5c62394a
Ancestor: 6e02b385a7decbbfdad9bc91c80b0bc86fbd8129
Author: darkrain42 at pidgin.im
Date: 2009-06-27T17:50:49
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aeccaeff23a7b1b719d2b0c30b86b85b2d1effab

Added files:
        libpurple/protocols/oscar/clientlogin.c
        pidgin/plugins/disco/Makefile.mingw
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac finch/plugins/gnthistory.c libpurple/cipher.c
        libpurple/connection.c libpurple/connection.h
        libpurple/core.h libpurple/network.c libpurple/network.h
        libpurple/notify.h libpurple/plugins/ssl/ssl-gnutls.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/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/history.c
        libpurple/protocols/msn/history.h
        libpurple/protocols/msn/notification.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/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/eggtrayicon.c
        pidgin/gtkdocklet-x11.c pidgin/gtkft.c
        pidgin/gtkicon-theme-loader.c pidgin/gtkimhtml.c
        pidgin/gtknotify.c pidgin/gtkstatusbox.c
        pidgin/plugins/Makefile.mingw
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/disco/xmppdisco.h
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/pidginrc.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ca.po po/de.po

ChangeLog: 

merge of '1356d70e521b4cb5ab8ea10f0927063b5c62394a'
     and '6e02b385a7decbbfdad9bc91c80b0bc86fbd8129'