pidgin: 225e515a: merge of '796290d1402d75f50e27f51683443b...

Sun Jun 21 20:50:32 EDT 2009

-----------------------------------------------------------------
Revision: 225e515a43307f04c7c0570ba5877858a0f71209
Ancestor: 796290d1402d75f50e27f51683443b86707c9c26
Ancestor: 8740eeac007708126ac1672fb005bea399aa7f33
Author: sadrul at pidgin.im
Date: 2009-06-22T00:47:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/225e515a43307f04c7c0570ba5877858a0f71209

Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/yahoo/yahoo.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '796290d1402d75f50e27f51683443b86707c9c26'
     and '8740eeac007708126ac1672fb005bea399aa7f33'