diff HACKING @ 16120:e5af828c2f54

merge of 'aa2170e50c202539ea83f299b04eedf9a5d62178' and 'e6a776d806e488fa79eada7619f40300fdecda61'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 15 Apr 2007 00:15:32 +0000
parents c4a5d8950d8c
children d73ee2690376
line wrap: on
line diff