im.pidgin.pidgin: c2e14cd3c979b546ad1a56ede51866427e799692

Sat Feb 9 02:45:42 EST 2008

-----------------------------------------------------------------
Revision: c2e14cd3c979b546ad1a56ede51866427e799692
Ancestor: 4c2c343355f23e33c5b251b3d61f07af3fd8ac8b
Ancestor: 8bec06d2cd0a64ece46cb3cd73db9b085b91e161
Author: jeff2 at soc.pidgin.im
Date: 2008-02-09T07:35:21
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/c2e14cd3c979b546ad1a56ede51866427e799692

Modified files:
        pidgin/gtkconv.c pidgin/gtkconvwin.h pidgin/gtkprefs.c
        pidgin/pidginstock.c pidgin/pidginstock.h

ChangeLog: 

merge of '4c2c343355f23e33c5b251b3d61f07af3fd8ac8b'
     and '8bec06d2cd0a64ece46cb3cd73db9b085b91e161'