Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 5 Jan 2021 15:23:02 +0000 (11:23 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 5 Jan 2021 15:23:02 +0000 (11:23 -0400)

Trivial merge