diff ChangeLog @ 31130:38cd00d46b4d

merge of '342a95ba56375edcb99f196a32acfdb530660c2a' and '711a26934550db93abe9d01aa87be20ed8dfe6e8'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 10 Jan 2011 01:17:34 +0000
parents 95c33536ac16
children 14a36bcf6704 601820fe2acc
line wrap: on
line diff