# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359806494 -3600
# Node ID ae99c0f06fcbf7297c33e873956fd8c556421a69
# Parent  bd88067af19dabf0d0e88755e60d56cd852779b5# Parent  f3eb91157cf617e86c0e5ac83ff25fa8288cdf2c
merge with hg2.4 compat branch