Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 29 Sep 2016 20:58:09 +0000 (16:58 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 29 Sep 2016 20:58:09 +0000 (16:58 -0400)
commit7cd6a6a39c0d774ddfc9773b96d26f1e6237ed25
tree316fa8580a90a18809dc456b1799cd3e36766e4e
parent5ed050c152be812ab74d5f8cece241d629dcd00d
parent69e41f39436e4f83b33474266086f189cb3f6bcb
Merge branch 'master' of ssh://git-annex.branchable.com