pidgin: fdd5465d: merge of '59e2b9896f25e8517b3f0f4d742c14...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: fdd5465df21882ff85bf2dfb27b333348909bd0f
Ancestor: 59e2b9896f25e8517b3f0f4d742c143e6fccd6e0
Ancestor: c2b5d965f04a15ae8caa5262870b9feae90390d9
Author: malu at pidgin.im
Date: 2008-09-25T04:51:19
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fdd5465df21882ff85bf2dfb27b333348909bd0f

Modified files:
        ChangeLog pidgin/gtkimhtml.c

ChangeLog: 

merge of '59e2b9896f25e8517b3f0f4d742c143e6fccd6e0'
     and 'c2b5d965f04a15ae8caa5262870b9feae90390d9'