Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 24 Feb 2017 15:33:57 +0000 (11:33 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 24 Feb 2017 15:33:57 +0000 (11:33 -0400)
commit8971949d60fb06a564d1b5d5865d9ff68a22a381
tree6aa14a902cff6ead1b3aa894efdf5fe807b0b8a0
parent02d3fbbd8b68d8e5fe3c5e50ac4bbd1384116a2d
parent4a7ae6f9c0a5b5793034a1a17176999168ac2cb0
Merge branch 'master' of ssh://git-annex.branchable.com