diff ChangeLog @ 19471:217c4b1d3a09

merge of 'b6c53eca73f8f22b0d8fafd412b2570c631455be' and 'db850ab42d8f30eaba15fafaa3dc5ec1137141e7'
author Ethan Blanton <elb@pidgin.im>
date Mon, 27 Aug 2007 17:22:16 +0000
parents 64f226232133
children bb5ec4f1e25b
line wrap: on
line diff