# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1263246109 -3600
# Node ID 69e07d234cc67058eca4240dc14c5b12cd61687f
# Parent  826bb566541c4ecc8809eb81c6ba76620885a047# Parent  9bf3ebdb19aea878c6a49a0cd41db46dd55de35a
merge main with stable