# HG changeset patch
# User Thierry Florac <tflorac@ulthar.net>
# Date 1574759705 -3600
# Node ID 4b0f521af8ad8ab2cd64a2774b29480646996852
# Parent  0b9e3e67f43d1b0cf8eb06b7f67f298cb0aa6475# Parent  ec94b4026195099d1f1a2c878806ce412aa5aa40
Merge branch dev-tf