diff HACKING @ 28471:96f0f6af5da2

merge of '2a337fc21125a25203efca7d15ea3002fa8e35fb' and '70c2ddd8cc314e53815d3772bf1364a66164319a'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 30 Oct 2009 06:52:29 +0000
parents d73ee2690376
children
line wrap: on
line diff