diff COPYING @ 10233:69e07d234cc6

merge main with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Jan 2010 22:41:49 +0100
parents e6db25785b00
children 8c8b55733cbd
line wrap: on
line diff