diff NEWS @ 21817:c03139b26b77

merge of '9f782ce34a9721fbb634a2c73107820447cc3dc1' and 'c249c7a3d3148046c85b2f023c4ca56b4d60ea2c'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 11 Dec 2007 18:42:26 +0000
parents 3f8e1ef0a8fb
children a9347b5101a9
line wrap: on
line diff