Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 12 Nov 2015 22:24:56 +0000 (18:24 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 12 Nov 2015 22:24:56 +0000 (18:24 -0400)
commitbb4123a649a5b4c47112a3de9df651fd319779e2
tree8d96eacc56425dca91200be0e1f3e46da2667856
parent2a4c2c310ab364be42b508a453024484179768b2
parent380cb754058026c094a228a2c5c39df0c96d3388
Merge branch 'master' of ssh://git-annex.branchable.com