diff ChangeLog.win32 @ 32550:f9650f6b636d

merge of 'd3c4fbebab720da0885766add6272f14814edc99' and 'deb06ab6aa118efb674f1a8434ff529e67b28809'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Thu, 23 Feb 2012 09:01:12 +0000
parents a7cf3dbaba02
children
line wrap: on
line diff