diff pidgin/gtkplugin.c @ 18737:3f965b7c7ffa

merge of '966f1125e1910ec58ae63a175dc5efe1fd3e10e0' and 'c2cc31f23a71f23062555721f8101fc9c997bae2'
author Mark Doliner <mark@kingant.net>
date Sun, 29 Jul 2007 21:12:17 +0000
parents 08db93bbd798
children 57d350900136 13a779fe3f1e 9d198ce0ab65
line wrap: on
line diff