comparison HACKING @ 15768:c7a7ea7c07a8

merge of '12db4a9e09675b5127f1f310972303177d1b2ca8' and 'ad7432a7ea65bcc312ac4541c0cfe777630248f9'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 04 Mar 2007 16:52:02 +0000
parents c4a5d8950d8c
children d73ee2690376
comparison
equal deleted inserted replaced
15763:0869f00ca178 15768:c7a7ea7c07a8