Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 16:16:18 +0000 (12:16 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 16:16:18 +0000 (12:16 -0400)
commit3b3d6b63e61641ddfec3fe9f1e3dd940a1eacad0
tree1be569928b841292fea7dda9357520cd7500860f
parent48d9624a2d77c9ffef69233289c4f9f93bf8733b
parentb55d5a216d9179bec8f18fc32e4e1552d9d5541d
Merge branch 'master' of ssh://git-annex.branchable.com