# HG changeset patch # User Pierre-Yves David # Date 1535556205 -7200 # Node ID 405fc2c67afd2257d6ff65ebeee6ddf18b4d2415 # Parent 3f9b29f6713778a31ee1490ca97b0f98adf3a3b2# Parent 7c22a718769592430114cbf8ae4f6412c2191a02 branching: merge with stable