diff NEWS @ 32011:ff88437cffaf

merge of '09b81079c02d3b84a6dedbf29d6ce66862c09a71' and 'c463e6d46ceeceb09d3030a6c1f6360f7e5a6b40'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 06 May 2011 06:31:40 +0000
parents 7738498d4010
children 4a8ea9c95560
line wrap: on
line diff