pidgin: 66c343e5: merge of '52f4817b6a7b2db5cad41758c4911c...

Sat Jun 5 22:20:46 EDT 2010

-----------------------------------------------------------------
Revision: 66c343e57ba5828a78d88d159a594e3c4131e50e
Ancestor: 52f4817b6a7b2db5cad41758c4911c0f20f77eb2
Ancestor: dfe958320740154e5d306f62dd8e7d260970ec29
Author: sadrul at pidgin.im
Date: 2010-06-06T02:17:36
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/66c343e57ba5828a78d88d159a594e3c4131e50e

Modified files:
        Makefile.am pidgin/Makefile.mingw pidgin/gtkimhtml.c

ChangeLog: 

merge of '52f4817b6a7b2db5cad41758c4911c0f20f77eb2'
     and 'dfe958320740154e5d306f62dd8e7d260970ec29'