Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 11 Nov 2015 19:08:57 +0000 (15:08 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 11 Nov 2015 19:08:57 +0000 (15:08 -0400)
commitecc203bde2bf5ab12320438e3993df9372ca8d1f
tree25fdb15a67faf2d4977f4394d645b57ec861761f
parentea1d3280318ab8816b521ab2ea7ead9d04ab8425
parentd4a988c8fafcd36ccfacd0f6e686878a2d6c2393
Merge branch 'master' of ssh://git-annex.branchable.com