From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Mon, 21 Feb 2022 21:21:30 +0000 (+0100)
Subject: manual merge
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/m1-debian/commitdiff_plain/26f5bdf315fa59b2cc93158de1f92e5a1e6ee7cd?ds=sidebyside;hp=26f5bdf315fa59b2cc93158de1f92e5a1e6ee7cd

manual merge
---