Merge tag 'upstream/8.0'
authorRafael Laboissière <rafael@debian.org>
Tue, 4 Jan 2022 15:47:12 +0000 (12:47 -0300)
committerRafael Laboissière <rafael@debian.org>
Tue, 4 Jan 2022 15:47:12 +0000 (12:47 -0300)
Upstream version 8.0


Trivial merge