Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 16:55:58 +0000 (12:55 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 24 Dec 2016 16:55:58 +0000 (12:55 -0400)
commit3110cedb5b1391ac77384e7250b809fb4c201e81
tree411eed7db7e60289967a7089da354b4c2bc915a7
parent993f30ac927da6ddb632a6ca42f4ca495d6c1bfa
parent458a786c4d4882a2aad3c0ecf7298f337c9436a3
Merge branch 'master' of ssh://git-annex.branchable.com