Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 29 Oct 2015 15:06:29 +0000 (11:06 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 29 Oct 2015 15:06:29 +0000 (11:06 -0400)
commit4c9c87583ef87cbe11336bd2c558b1e9ee016970
treee64c60578d7fcf24284c517f554ba5de5e41d885
parent8b09e9306a62b3dcc35ce3b48b0bd160b2b62e1f
parent68c33381cc7357a4affc2e2ec6adf8ae875a4355
Merge branch 'master' of ssh://git-annex.branchable.com