Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 30 Jan 2017 21:34:48 +0000 (17:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 30 Jan 2017 21:34:48 +0000 (17:34 -0400)
commiteeb227aeb85e3ec90fd60c44ee6187fc7ca807d3
tree7920ab2bbcc6cee03c882b09533f0398679b8cb2
parent85b62fa79822c4d09d425541a12266f58706e1bb
parentaa24a7347b0dca80a586ec5de8aca59be8f4ae25
Merge branch 'master' of ssh://git-annex.branchable.com