Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Mon, 12 Oct 2020 15:35:40 +0000 (11:35 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 12 Oct 2020 15:35:40 +0000 (11:35 -0400)

Trivial merge