Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Thu, 8 Oct 2020 14:38:15 +0000 (10:38 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 8 Oct 2020 14:38:15 +0000 (10:38 -0400)

Trivial merge