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

Trivial merge