diff NEWS @ 19343:ae5c82fd7920

merge of '24c8940605f5b11b2aea17c6ca6f3094dff141ab' and 'e1e5c6d6761c5ca78ed3ba45df742983421c1082'
author Ethan Blanton <elb@pidgin.im>
date Mon, 20 Aug 2007 17:42:51 +0000
parents cf181e3d8395
children f60b80e79e01
line wrap: on
line diff