Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 13 Jan 2021 16:31:43 +0000 (12:31 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 13 Jan 2021 16:31:43 +0000 (12:31 -0400)

Trivial merge