diff ChangeLog @ 16066:b5118ddf37c2

merge of '61bd92273cfaf5b40f9f2dbedb86832dcf9ffda7' and 'b2ab459bdd4f7d798b5581c3adc6706496153426'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 11 Apr 2007 17:46:01 +0000
parents cc3c50816cc9
children 3da0548dc284
line wrap: on
line diff