diff pidgin/gtkimhtmltoolbar.c @ 28190:9824572dbb49

merge of '690e0c46a823bc8a86dd97edef1482d8ba30d3a6' and '83524d788808ede71470a5dd37e9256a1626559b'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Fri, 07 Aug 2009 00:08:43 +0000
parents 38a5df43d525
children f3ccb5a36fd6 401012968fea 48ea900ee72a ce876e58cf6a
line wrap: on
line diff