diff ChangeLog @ 19121:bd44f661f4c8

merge of '7229e4b74f5d355cabe59ecbbe84f35f1d9cdca9' and 'd415e1047f1286523321e03ed1bca413f396edac'
author Eric Polino <aluink@pidgin.im>
date Fri, 29 Jun 2007 01:54:45 +0000
parents 40d51793f2d7
children cbec54ecd9ab b2caad7bc71b
line wrap: on
line diff