im.pidgin.pidgin: a1ebdbd7a89365f6aabb2525d13d627bce21d237

Mon Jan 7 22:05:54 EST 2008

-----------------------------------------------------------------
Revision: a1ebdbd7a89365f6aabb2525d13d627bce21d237
Ancestor: a5456268d56c1a4745ac4abb84a176ecc6f68109
Ancestor: eaa01cc61dc67594e3f946e2b119f01ef4177d3e
Author: nosnilmot at pidgin.im
Date: 2008-01-08T03:00:20
Branch: im.pidgin.pidgin

Modified files:
        libpurple/buddyicon.c pidgin/gtkconv.c

ChangeLog: 

merge of 'a5456268d56c1a4745ac4abb84a176ecc6f68109'
     and 'eaa01cc61dc67594e3f946e2b119f01ef4177d3e'