diff ChangeLog @ 28096:1a6c2144ba08

merge of 'a6c4b3ed3fdfcd5eafd45342656fed541020f353' and 'ae28e0b0bf4488cc755ccad2b98841440ad6fe70'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 31 Jul 2009 04:09:41 +0000
parents b5e52173ef67
children 6187a40eea57 b6a1ade72555
line wrap: on
line diff