diff pidgin/gtkimhtml.c @ 21741:34787c0d841c

merge of '91693085a71d31037a9bbe0743802ed307b3ece4' and 'c62c3c810cef3a653af3b2eb3049b3b93d662e8a'
author Richard Nelson <wabz@pidgin.im>
date Mon, 03 Dec 2007 07:05:57 +0000
parents c9946b9965c9
children d376b1e191b5 b05a8f1db1c3 6befd211e707
line wrap: on
line diff