# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1682061598 -7200
# Node ID 4be7221c92dd9bc3f4b050f12968a36082bb94f1
# Parent  dec770139554e97b14e4e7028fc27944fd88bc1c# Parent  6b9bd2520680026c89acf3cc01c8a402043deb5f
merge