diff HACKING @ 15585:9cbf44d3c0f9

merge of 'a55d39e9c7d6bfdb22fd82eaa1510ba558caa72b' and 'ce46e38b5be321a0427deaf9295a23267ad47893'
author Ethan Blanton <elb@pidgin.im>
date Thu, 08 Feb 2007 12:35:14 +0000
parents c4a5d8950d8c
children d73ee2690376
line wrap: on
line diff