# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1485957894 -3600
# Node ID 0303bb24f6731288802c66077da90f2c1c994d7f
# Parent  b674277ea4eff26da505ad9ae9abe32b85c2e411# Parent  e553fc96447d7d9ede3f7b0566ef9e2e093b66dd
merge with default to prepare the next version