Revision a8a4f4264b01ec0650153f0e2ccdfd23f62336f4

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: a8a4f4264b01ec0650153f0e2ccdfd23f62336f4
Ancestor: 4ced433906d17bb2758a2b010ce264314d17fe04
Ancestor: 876a32332db2efa993b1f6461d35e6e686c6715a
Author: nosnilmot at pidgin.im
Date: 2007-06-04T01:30:37
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '4ced433906d17bb2758a2b010ce264314d17fe04'
     and '876a32332db2efa993b1f6461d35e6e686c6715a'


To get the patch for this revision, please do this:
mtn log --last 1 --diffs --from a8a4f4264b01ec0650153f0e2ccdfd23f62336f4