pidgin: fff3bf86: merge of '0c046bad9fd4d69c10aa296f24460f...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: fff3bf86da256e3448f5453a1965c58a3487e828
Ancestor: 0c046bad9fd4d69c10aa296f24460f584920431d
Ancestor: e4af1914033e4084f4fd52bc5d08d1ce48ed0c8d
Author: deryni at pidgin.im
Date: 2009-07-05T15:11:52
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fff3bf86da256e3448f5453a1965c58a3487e828

Modified files:
        ChangeLog ChangeLog.API libpurple/cipher.c libpurple/debug.c
        libpurple/debug.h libpurple/internal.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/msn/soap.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/tests/test_cipher.c libpurple/util.c
        pidgin/gtkdialogs.c po/ChangeLog po/de.po po/fi.po po/sl.po
        po/zh_CN.po

ChangeLog: 

merge of '0c046bad9fd4d69c10aa296f24460f584920431d'
     and 'e4af1914033e4084f4fd52bc5d08d1ce48ed0c8d'