# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1292264360 -3600
# Node ID ca08b42e8453ea6fd7362a51fb984ee0bd4fda5a
# Parent  42ece797e8ad254fa7fc6ce73d1aee0ce8da0715# Parent  cfc8823f5c9e2f17742edd31e5ee9bf835b9d71d
Merge with b98f3c8f8601cf2d735dc8a988ba08dd8d07f54b