# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1485962591 -3600
# Node ID e723a35599f3636cb060cefc5ebb79788ce1c7dc
# Parent  ed95f439843b7ca8b23add2c97b17c0c0ffc2d97# Parent  54120614e9e50bd05ee013bacf5197c9c1886fdc
merge with stable