diff HACKING @ 15589:d07c1e2e0496

merge of 'efde7d02b602348f7af4ff6a3c8364f9aabea9df' and 'f59170f361556a597e522badf428349c3573bfe9'
author Luke Schierer <lschiere@pidgin.im>
date Fri, 09 Feb 2007 02:21:08 +0000
parents c4a5d8950d8c
children d73ee2690376
line wrap: on
line diff