diff hgmerge @ 5161:24d306834de5

merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Tue, 14 Aug 2007 17:20:51 +0200
parents 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff