Mark branch 'upstream-rochade' as merged into upstream-stable
authormirabilos <tg@debian.org>
Sun, 31 Jan 2021 21:56:05 +0000 (22:56 +0100)
committermirabilos <mirabilos@evolvis.org>
Sun, 31 Jan 2021 21:56:05 +0000 (22:56 +0100)

Trivial merge