Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 18 Nov 2015 18:13:11 +0000 (14:13 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 18 Nov 2015 18:13:11 +0000 (14:13 -0400)
commit7c156f35485668c4039d8097af7d7c86ff3afc31
treeecc85f278570a86105fbcb26e89c885464cd4890
parent5097d1a365aed27e6066b27d4084a3bd878d6ccf
parent6bb284a24fea0b1a7f268be549e1b99fcd59d87a
Merge branch 'master' of ssh://git-annex.branchable.com