diff HACKING @ 15428:07f3ed5adb42

merge of '6f79d2e845520107afda4aa99727183840cf5078' and '7874eb23324d2920dd6c344cc81192164319adac'
author Nathan Walp <nwalp@pidgin.im>
date Sat, 27 Jan 2007 02:06:17 +0000
parents c4a5d8950d8c
children d73ee2690376
line wrap: on
line diff