pidgin: 50671ff8: merge of 'c2f80865e78beb384f2dec792cac08...

[nosnilmot at pidgin.im]

-----------------------------------------------------------------
Revision: 50671ff813e20c737448d900013ebb7206fca054
Ancestor: c2f80865e78beb384f2dec792cac08ac44cf4eea
Ancestor: ddb947301980e564af0ce937a3c94e5b6116304c
Author: nosnilmot at pidgin.im
Date: 2008-03-17T01:56:29
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/50671ff813e20c737448d900013ebb7206fca054

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

ChangeLog: 

merge of 'c2f80865e78beb384f2dec792cac08ac44cf4eea'
     and 'ddb947301980e564af0ce937a3c94e5b6116304c'