pidgin: 6cb70090: merge of '034300b33708a7dbb7856d91c30984...

[rekkanoryo at pidgin.im]

-----------------------------------------------------------------
Revision: 6cb700901feb39340173b2abee9205a5c6e91a2d
Ancestor: 034300b33708a7dbb7856d91c3098493b2dffa34
Ancestor: adf7d277ae63ff767e0db40965e3eee80cec5e46
Author: rekkanoryo at pidgin.im
Date: 2009-07-05T02:26:03
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/6cb700901feb39340173b2abee9205a5c6e91a2d

Modified files:
        ChangeLog ChangeLog.API libpurple/cipher.c libpurple/debug.c
        libpurple/debug.h libpurple/internal.h
        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/fi.po po/sl.po
        po/zh_CN.po

ChangeLog: 

merge of '034300b33708a7dbb7856d91c3098493b2dffa34'
     and 'adf7d277ae63ff767e0db40965e3eee80cec5e46'