pidgin: 48f64a45: merge of '7e8d9f694132bc0cdbb6088ca5b557...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 48f64a452d992965cd118c1c8fc3e321c6d3bdf7
Ancestor: 7e8d9f694132bc0cdbb6088ca5b557480c71ba45
Ancestor: f19814a9bc18cc2b84bdfc83d02569128c4fd66f
Author: darkrain42 at pidgin.im
Date: 2009-05-04T02:57:02
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/48f64a452d992965cd118c1c8fc3e321c6d3bdf7

Modified files:
        ChangeLog.API libpurple/blist.c
        libpurple/protocols/jabber/caps.c pidgin/gtkimhtml.h

ChangeLog: 

merge of '7e8d9f694132bc0cdbb6088ca5b557480c71ba45'
     and 'f19814a9bc18cc2b84bdfc83d02569128c4fd66f'