diff HACKING @ 32698:91a46f726cf4

merge of '7b6523560e839d3775c83d46b3c466732954bb03' and 'aa17fd919c5b0e1d9405ceccffb4b2e83487d6aa'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 23 Dec 2011 08:22:03 +0000
parents d73ee2690376
children
line wrap: on
line diff