pidgin: e3ab9304: merge of '740f6d249277d1f3ffc01d5fab1a58...

[resiak at pidgin.im]

-----------------------------------------------------------------
Revision: e3ab9304de960d8da40ffcc4fe6a16993a1d2537
Ancestor: 740f6d249277d1f3ffc01d5fab1a580c2dd8fc79
Ancestor: c22d824152072143b7ba7eb8b365c97069c60761
Author: resiak at pidgin.im
Date: 2008-05-26T02:16:05
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e3ab9304de960d8da40ffcc4fe6a16993a1d2537

Modified files:
        pidgin/gtkblist.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '740f6d249277d1f3ffc01d5fab1a580c2dd8fc79'
     and 'c22d824152072143b7ba7eb8b365c97069c60761'