Merge tag 'upstream/2.5'
authorRafael Laboissière <rafael@debian.org>
Fri, 10 Dec 2021 18:12:15 +0000 (15:12 -0300)
committerRafael Laboissière <rafael@debian.org>
Fri, 10 Dec 2021 18:12:15 +0000 (15:12 -0300)
commit8c5ff3d538c15d9f1f5bc56ef3b78edd1c34b0a5
treed81f7d62518737b2e961d6aec6f3b48f1eaed364
parentd9c14b9bba6ce411e5248a0b7aa230e319d556f1
parentd187eac4bde3d27aae8ee200485c47832dc39d71
Merge tag 'upstream/2.5'

Upstream version 2.5