im.pidgin.pidgin: e67f992dbbac76473bada603b957a38737723832

Sat Feb 9 04:10:38 EST 2008

-----------------------------------------------------------------
Revision: e67f992dbbac76473bada603b957a38737723832
Ancestor: 74350098695c8021af246fd51aa5389109e8fa3b
Ancestor: 956f3b4fffefc5833167f00438fc7d72366562a3
Author: jeff2 at soc.pidgin.im
Date: 2008-02-09T09:04:39
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/e67f992dbbac76473bada603b957a38737723832

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

ChangeLog: 

merge of '74350098695c8021af246fd51aa5389109e8fa3b'
     and '956f3b4fffefc5833167f00438fc7d72366562a3'