diff HACKING @ 28572:b26b9f8c9dbd

merge of '23b195ee466a16623c26be2604cba4a8c5b889b2' and '79d3923b372c2c78a19e2fd702df542bd391a1ea'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Mon, 16 Nov 2009 07:19:27 +0000
parents d73ee2690376
children
line wrap: on
line diff