im.pidgin.pidgin: b00f51f9bb505d4518268d3340d2a8fd0a200f9b

Mon Dec 17 21:35:57 EST 2007

-----------------------------------------------------------------
Revision: b00f51f9bb505d4518268d3340d2a8fd0a200f9b
Ancestor: 2e5cda103238f64d27e4ed5aa92c149f6d50a5ec
Ancestor: eba941c70407d0a6e17fa2204792caadadeda848
Author: datallah at pidgin.im
Date: 2007-12-18T02:25:10
Branch: im.pidgin.pidgin

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

ChangeLog: 

merge of '2e5cda103238f64d27e4ed5aa92c149f6d50a5ec'
     and 'eba941c70407d0a6e17fa2204792caadadeda848'