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

Trivial merge