Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 17 Oct 2016 20:37:59 +0000 (16:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 17 Oct 2016 20:37:59 +0000 (16:37 -0400)

Trivial merge