diff HACKING @ 17138:b40f3d7da1fc

merge of '49922af0141ac5ca1baaa557377a5343ae781fb9' and 'db33dae23c4751158ddcd578ea0fc89ae1090fdd'
author Luke Schierer <lschiere@pidgin.im>
date Sat, 19 May 2007 02:46:34 +0000
parents d73ee2690376
children
line wrap: on
line diff