pidgin: 25f34bad: merge of '453bf3da68c1baca3d6585b338ac13...

[deryni at pidgin.im]

-----------------------------------------------------------------
Revision: 25f34bad34d520409df11f320a0f85c239c67709
Ancestor: 453bf3da68c1baca3d6585b338ac13df415c9be0
Ancestor: aedf94cca64dd46503c2482445e6de4e9816b7df
Author: deryni at pidgin.im
Date: 2009-08-16T05:29:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/25f34bad34d520409df11f320a0f85c239c67709

Modified files:
        ChangeLog ChangeLog.API finch/libgnt/gntkeys.c
        libpurple/account.c libpurple/account.h
        libpurple/protocols/msn/Makefile.mingw
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c pidgin/gtkblist.c
        pidgin/gtkcertmgr.c pidgin/gtkconv.c
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

merge of '453bf3da68c1baca3d6585b338ac13df415c9be0'
     and 'aedf94cca64dd46503c2482445e6de4e9816b7df'