Merge branch 'master' of ssh://git-annex.branchable.com into master
authorJoey Hess <joeyh@joeyh.name>
Thu, 10 Sep 2020 13:10:00 +0000 (09:10 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 10 Sep 2020 13:10:00 +0000 (09:10 -0400)

Trivial merge