Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 7 Dec 2015 21:25:20 +0000 (17:25 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 7 Dec 2015 21:25:20 +0000 (17:25 -0400)
commit50398c69a1d36e73acc6bfad80cd2894786a0c96
tree5d3bbaebe56ace34fd18f78c6f10cd498bce2589
parentd9ec9a56d4aee6d1ba5f5c6333e62eb798f3b3cf
parentbf022166909b0b19b85467157cc632e83607c5d0
Merge branch 'master' of ssh://git-annex.branchable.com