Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 14 Dec 2020 21:42:25 +0000 (17:42 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 14 Dec 2020 21:42:25 +0000 (17:42 -0400)

Trivial merge