diff NEWS @ 18337:f35af4b35f70

merge of '095a1f48d1182da336a43daa9b063aa279ac625e' and 'f7428afdd994ecfb153951664c616bda5c804d67'
author Ethan Blanton <elb@pidgin.im>
date Thu, 28 Jun 2007 03:01:02 +0000
parents b14908036030
children 70c758256110
line wrap: on
line diff