Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 14 Oct 2015 16:37:58 +0000 (12:37 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 14 Oct 2015 16:37:58 +0000 (12:37 -0400)
commit3f32670fca015cab0ea721097fdc6cbb4748d8a1
tree30fc5e4b44b85617d85ac65c9c6770fcc7e82800
parent9e90c033d3d8846ab6c834f9d4cb260039644cf4
parent9d2a602661261d9761ca66d67955c2e5baee3a64
Merge branch 'master' of ssh://git-annex.branchable.com