diff ChangeLog @ 18271:589c9ebf84db

merge of '683ac90580e5631dcc8b79c3caea1adc7b92ffec' and '947b20b6fc725a1f22dd7b7b23ebbaee89f0cfed'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 24 Jun 2007 17:52:52 +0000
parents 40d51793f2d7
children cbec54ecd9ab b2caad7bc71b
line wrap: on
line diff