diff COPYING @ 16492:915a56e08a9d

merge of 'b40bd1885046f301b11610cd406822e5d32968f7' and 'c160ad5b1979376c855bd74321ba7bfac438181f'
author Tim Ringenbach <marv@pidgin.im>
date Mon, 23 Apr 2007 00:52:51 +0000
parents a5ace2e037bc
children 44b4e8bd759b
line wrap: on
line diff