Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 7 Jan 2021 17:38:46 +0000 (13:38 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 7 Jan 2021 17:38:46 +0000 (13:38 -0400)

Trivial merge