pidgin: b763db8b: merge of '1490bc9b5da3684cfe634ae71d22e5...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: b763db8bf8b9f2382aa218be71fad43a8d647915
Ancestor: 1490bc9b5da3684cfe634ae71d22e5903a639e7c
Ancestor: 96fc49b5da18a0e87d5d8e5976ce7b6abd15bad3
Author: deryni at pidgin.im
Date: 2009-06-26T23:32:51
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/b763db8bf8b9f2382aa218be71fad43a8d647915

Modified files:
        ChangeLog ChangeLog.API configure.ac doc/notify-signals.dox
        libpurple/account.c libpurple/buddyicon.h libpurple/core.h
        libpurple/log.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.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/history.c
        libpurple/protocols/msn/history.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/purple-remote pidgin/gtkaccount.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkprefs.c
        pidgin/plugins/perl/Makefile.am
        pidgin/plugins/perl/common/Makefile.PL.in po/ca.po

ChangeLog: 

merge of '1490bc9b5da3684cfe634ae71d22e5903a639e7c'
     and '96fc49b5da18a0e87d5d8e5976ce7b6abd15bad3'