Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 7 Jan 2020 17:26:14 +0000 (13:26 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 7 Jan 2020 17:26:14 +0000 (13:26 -0400)

Trivial merge