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

Trivial merge