pidgin: 9eade79c: merge of '3012bdc54e5d2391c4fe52e687e879...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 9eade79ca7cffe546e6b15137370ca24c2bffe5e
Ancestor: 3012bdc54e5d2391c4fe52e687e87903ecbf44cc
Ancestor: b4d9ebda1400b338079c89d5b6ac444b73755128
Author: deryni at pidgin.im
Date: 2009-06-18T23:04:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9eade79ca7cffe546e6b15137370ca24c2bffe5e

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/notify-signals.dox libpurple/account.c
        libpurple/buddyicon.h libpurple/connection.c
        libpurple/network.c libpurple/network.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/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.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_packet.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c pidgin/eggtrayicon.c
        pidgin/gtkaccount.c pidgin/gtkdocklet-x11.c pidgin/gtkft.c
        pidgin/gtkicon-theme-loader.c
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/perl/Makefile.am
        pidgin/plugins/perl/common/Makefile.PL.in po/de.po

ChangeLog: 

merge of '3012bdc54e5d2391c4fe52e687e87903ecbf44cc'
     and 'b4d9ebda1400b338079c89d5b6ac444b73755128'