pidgin: 8a857359: merge of '233c28248ecd717704ccb1932748bd...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 8a85735913e31b9becf0404220e7fe2335dec8a9
Ancestor: 233c28248ecd717704ccb1932748bdf97b679cf1
Ancestor: f575a8d88f75dfe9f1541c8c290a3b7ef621c4a0
Author: qulogic at pidgin.im
Date: 2009-05-04T00:04:55
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8a85735913e31b9becf0404220e7fe2335dec8a9

Modified files:
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/notification.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkstatusbox.c

ChangeLog: 

merge of '233c28248ecd717704ccb1932748bdf97b679cf1'
     and 'f575a8d88f75dfe9f1541c8c290a3b7ef621c4a0'