im.pidgin.pidgin: 020f19d581a60277c8cff99113f0c09b4d46d6bc

Wed Dec 5 06:15:59 EST 2007

-----------------------------------------------------------------
Revision: 020f19d581a60277c8cff99113f0c09b4d46d6bc
Ancestor: 7e3fbc31d04d03b44eec338a8703cd9329136a9a
Ancestor: cc1c6037df9dd3887248c7bf7627ee45663949ff
Author: evands at pidgin.im
Date: 2007-12-05T11:11:59
Branch: im.pidgin.pidgin

Modified files:
        libpurple/plugins/autoaccept.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '7e3fbc31d04d03b44eec338a8703cd9329136a9a'
     and 'cc1c6037df9dd3887248c7bf7627ee45663949ff'