comparison ChangeLog @ 17311:32a07f5b9d29

merge of '7c29037a04f1949b8226b412c8437956511cac2c' and '8bec8c98bf912494f81194d8f4dd2e82ba2d2d23'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 25 May 2007 03:48:55 +0000
parents 92f7afd6c640
children 28682df9686a 3c4811489e30
comparison
equal deleted inserted replaced
17310:78cffe335402 17311:32a07f5b9d29