diff COPYRIGHT @ 16497:ce6b4346e56d

merge of '53e71fc52c4d4be3947b2404fe6332ae8d52dc55' and '795db06d1da098cc0db741abcdb48e5e4a0edcac'
author Tim Ringenbach <marv@pidgin.im>
date Mon, 23 Apr 2007 02:04:41 +0000
parents 7ba236539adf
children ca69d4253246 64778903211d
line wrap: on
line diff