diff ChangeLog.API @ 31465:0a58b4f084fb

merge of 'd73b1933a947fedcd8b3ecd30b2c373da2d1e63a' and 'f50e2ac93151292f5c9ad6ac3f42451e064407d4'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 10 Dec 2010 05:03:50 +0000
parents cc32d5f81523
children 3073caf38000
line wrap: on
line diff