diff TODO @ 15451:ce2446107ef3

merge of '704ad318e326940d16a5890ba527b24330ffbe47' and 'b022b66c5d07ddd4ca050aec4b9b390ccfb85b9c'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 28 Jan 2007 20:21:08 +0000
parents 4b5822e48b53
children 361c15e0b320
line wrap: on
line diff