im.pidgin.pidgin: 7d322b254abb8cda4c3ee1ba1706b592b88f1025

Fri Nov 30 22:56:53 EST 2007

-----------------------------------------------------------------
Revision: 7d322b254abb8cda4c3ee1ba1706b592b88f1025
Ancestor: 340d730b1b1e1164ee9eab77968ffd03cdf4996e
Ancestor: 3d09514342c28c798103b050651727e19709c903
Author: sadrul at pidgin.im
Date: 2007-12-01T01:48:26
Branch: im.pidgin.pidgin

Modified files:
        pidgin/gtkconv.c

ChangeLog: 

explicit merge of '340d730b1b1e1164ee9eab77968ffd03cdf4996e'
              and '3d09514342c28c798103b050651727e19709c903'