pidgin: 0c046bad: merge of '46a46162666e1d23ae6161df263904...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 0c046bad9fd4d69c10aa296f24460f584920431d
Ancestor: 46a46162666e1d23ae6161df2639044132cb894f
Ancestor: ada690f0424ce05fc000d5e97d25079fc1909318
Author: deryni at pidgin.im
Date: 2009-07-05T15:08:20
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/0c046bad9fd4d69c10aa296f24460f584920431d

Modified files:
        ChangeLog ChangeLog.API configure.ac doc/notify-signals.dox
        libpurple/account.c libpurple/buddyicon.h libpurple/cipher.c
        libpurple/debug.c libpurple/debug.h libpurple/dnssrv.c
        libpurple/dnssrv.h libpurple/internal.h libpurple/log.c
        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/jabber/buddy.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/myspace/message.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c libpurple/prpl.c
        libpurple/purple-remote libpurple/tests/test_cipher.c
        libpurple/util.c pidgin/gtkaccount.c pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkprefs.c
        pidgin/plugins/perl/Makefile.am
        pidgin/plugins/perl/common/Makefile.PL.in
        pidgin/plugins/pidginrc.c po/ChangeLog po/de.po po/fi.po
        po/sl.po po/zh_CN.po

ChangeLog: 

merge of '46a46162666e1d23ae6161df2639044132cb894f'
     and 'ada690f0424ce05fc000d5e97d25079fc1909318'