diff pidgin/gtkimhtmltoolbar.c @ 23835:55fdb7a28a7a

merge of '81070314dbb1793818b946813e1f0cdfda74f7ca' and 'bbc2518a5d7e36300f61d147b8133431841f6c9f'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 16 Aug 2008 19:41:05 +0000
parents 5c70d953a497
children 8777560c1d9f 3da0957e7821 28a7992d37b2
line wrap: on
line diff