diff HACKING @ 16071:5e436cd088e4

merge of '6c54a71cc08e47f3b1498c61ee62d17107165817' and 'eae479abc840db2b4808b2de16397086deefab3b'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 11 Apr 2007 18:03:09 +0000
parents c4a5d8950d8c
children d73ee2690376
line wrap: on
line diff