diff pidgin/gtkimhtml.c @ 29316:dac2aa640c4f

merge of '47bd1e8215f2e068f00151ed40c211745f596aba' and '768a62d29a0b004bea9c9265d4fc810558c0242a'
author Paul Aurich <paul@darkrain42.org>
date Mon, 01 Feb 2010 21:15:19 +0000
parents 2df96ace4f33
children 39bc284215ce 36bae5f00d32 10eaca0bf01a
line wrap: on
line diff