im.pidgin.pidgin: 7a2d6f31a70791d5e6e8af6fae041e30d5a1c48f

Thu Jan 24 00:30:49 EST 2008

-----------------------------------------------------------------
Revision: 7a2d6f31a70791d5e6e8af6fae041e30d5a1c48f
Ancestor: 4b11e0842d46778d47f4901ed6e00169c970471d
Ancestor: 67cb3e90607a4b30b35a7d3dfe73b7eec371ad3e
Author: markdoliner at pidgin.im
Date: 2008-01-24T05:25:02
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '4b11e0842d46778d47f4901ed6e00169c970471d'
     and '67cb3e90607a4b30b35a7d3dfe73b7eec371ad3e'