Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2015 17:33:38 +0000 (13:33 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 26 Oct 2015 17:33:38 +0000 (13:33 -0400)
commita3096ccf91be4079865c55e5aa133042065e2159
tree1105f831a9fe80a500df2b5cec740ab1f719d6ff
parent25f80b4682055f12a7eb8b518b6c064f94587757
parentcfff8f9f73a033eddb69f91e276cb97f12cc465a
Merge branch 'master' of ssh://git-annex.branchable.com