comparison ChangeLog @ 18318:c7d344acd1ff

merge of '6778b9e770331dedbf2e31f4edbbca4b854d939d' and 'ec0d5b3e6236972cc6f9d3bfa155a247e587e295'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 27 Jun 2007 19:31:39 +0000
parents 40d51793f2d7
children cbec54ecd9ab b2caad7bc71b
comparison
equal deleted inserted replaced
18308:4c3a24270114 18318:c7d344acd1ff