diff pidgin/gtkimhtml.c @ 31076:bbf7096ae66c

merge of '598ef461d4de936afef7298e55152cc7ecaa9b70' and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
author ivan.komarov@soc.pidgin.im
date Wed, 27 Oct 2010 18:26:14 +0000
parents 351d07aefb09
children c5ba7dd399fa 1203778744d0 1c660ba17ba1
line wrap: on
line diff