# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1593769089 -7200
# Node ID 378dc1a023f05b7655291a5940b06158237a2107
# Parent  e0de249c33784fce888af7bf2687f8bf5d59dfd5# Parent  f46f74d118d5b8784750e8f4b3c60eac08d50f8b
misc: merge from stable-3