diff ChangeLog.API @ 23206:1cc810daf355

merge of '04d1cb7493b8f54f33a413d3a60468704ab4be4b' and '77546963b893bde7fedfb022b63831b78d3f81e1'
author Ethan Blanton <elb@pidgin.im>
date Mon, 26 May 2008 20:03:40 +0000
parents ff8ec3d58367
children 3dc1bc92b170
line wrap: on
line diff