# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1585731680 -7200
# Node ID 5466d9340fc7920deb89c2ec9a4a357d0a0b049a
# Parent  2ec8e4cb93d39ca402323ab2f0f8d9fdc7f91d2c# Parent  0977f515286103c39034aaeaa2989d488dc3b0e5
merge