# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1533031659 -7200
# Node ID 9bc01ec6fc547cf13cd13798c2551535f7cddbee
# Parent  89e4184b26baa36a6743f84f00eb58cf9a511073# Parent  4cd909a1787340e63bbf8bc4d7c803e126037d87
branching: merge with the other head