Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 25 Nov 2020 10:25:13 +0000 (06:25 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 25 Nov 2020 10:25:13 +0000 (06:25 -0400)

Trivial merge