# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1594146489 -7200
# Node ID 5be586c6a23ecd1d00c85edb7b91f5d680bc44d7
# Parent  28944db5318b0db2b334548ca41510702b4f4344# Parent  aad700c387197967618da7a1e8af2270c5213c30
merge