pidgin: 9b6e1471: merge of '37145f1b4ec49b432ea571f96562d4...

Wed Oct 29 22:20:29 EDT 2008

-----------------------------------------------------------------
Revision: 9b6e1471438c574ac8ca860d5e9866dec4460677
Ancestor: 37145f1b4ec49b432ea571f96562d44f4c5a908e
Ancestor: 61ca2fe9d6a8984b52d59c8692a78c71a00fb443
Author: sadrul at pidgin.im
Date: 2008-10-29T22:06:50
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/9b6e1471438c574ac8ca860d5e9866dec4460677

Modified files:
        pidgin/gtkconv.c pidgin/gtkimhtml.c

ChangeLog: 

merge of '37145f1b4ec49b432ea571f96562d44f4c5a908e'
     and '61ca2fe9d6a8984b52d59c8692a78c71a00fb443'