# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1464363367 -7200
# Node ID a4de197218cf11de51b2a73c774be6ebaeba337a
# Parent  b09ac378f025f894eb36bc92d6c19be35e0b2c2e# Parent  7a2e0629bdee8cd842bb884094cef9683ed49520
merge with stable