diff NEWS @ 20585:a37166aa49ca

merge of '9e0721e5a46030c85511ed392b2b09c068e5ed27' and 'ab014bb16c8cc1dd52eed1d90e131babc2a6e593'
author Nathan Walp <nwalp@pidgin.im>
date Fri, 21 Sep 2007 00:32:33 +0000
parents 13f402ea8cf2
children 5c42c7c7780d
line wrap: on
line diff