# HG changeset patch
# User Olaf Wintermann <olaf.wintermann@gmail.com>
# Date 1729507677 -7200
# Node ID f2ee3a5c976ed335fb49457f9bc042ae60a81287
# Parent  349106ea431c6887472941247bca914348236112# Parent  122ddf40e24f24cd8fbdc759180a051bb4cd9bf8
merge