Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 17 Feb 2017 16:31:47 +0000 (12:31 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 17 Feb 2017 16:31:47 +0000 (12:31 -0400)

Trivial merge