# HG changeset patch # User Thierry Florac # Date 1523524728 -7200 # Node ID 5fe8d5ffccdef7919d1bb55faa5970abd52eb810 # Parent a7332a53e6dc33108235f32fd27c4d3ba573650f# Parent 918d3c9b53ee859beb2f1e374f522977bb30c26c Merge de la branche dev-dc