comparison ChangeLog @ 28573:7e7023193316

Fix merge error
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 16 Nov 2009 07:25:22 +0000
parents 738cd1adb3cf
children 83c02c568f03 7b1cfd48beab
comparison
equal deleted inserted replaced
28572:b26b9f8c9dbd 28573:7e7023193316