pidgin: 2a2005d1: merge of 'e238fa4987184e7ce5509bc8806f71...

[sadrul at pidgin.im]

-----------------------------------------------------------------
Revision: 2a2005d1ea7113d6455687048cd66fdb825b991b
Ancestor: e238fa4987184e7ce5509bc8806f7122ad41ae6e
Ancestor: e7903adb01a354969499931bea5fa76b55ade1ae
Author: sadrul at pidgin.im
Date: 2008-05-02T01:29:34
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/2a2005d1ea7113d6455687048cd66fdb825b991b

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

merge of 'e238fa4987184e7ce5509bc8806f7122ad41ae6e'
     and 'e7903adb01a354969499931bea5fa76b55ade1ae'