Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 6 Nov 2015 16:48:02 +0000 (12:48 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 6 Nov 2015 16:48:02 +0000 (12:48 -0400)
commitcf8076522c3cf09131832365557f66e17660f636
treef519be1b78186d0d37cdd3a11c16b4862ee98368
parent17b173dec90c325e27cd5684a1fcaf6cc53d40d7
parent749aa0fdb63952de441c39d56316c7cf86e5d31f
Merge branch 'master' of ssh://git-annex.branchable.com