diff pidgin/gtkimhtmltoolbar.c @ 21918:3ef7dae7c804

merge of '488405b28c709cbc7ca2a9df39974b06209fe0f1' and '7f9a61ac7dcaaac138e3e0fb8af8d084c0ebe023'
author Will Thompson <will.thompson@collabora.co.uk>
date Fri, 21 Dec 2007 19:38:21 +0000
parents 2a591a5b3322
children 07eb63fa0bdb
line wrap: on
line diff