Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 15:13:58 +0000 (11:13 -0400)
committerJoey Hess <joeyh@joeyh.name>
Tue, 13 Dec 2016 15:13:58 +0000 (11:13 -0400)
commitb0735d098d1106fa539627f357d6be5fd4156052
tree3fc6d484646193bd5f199acc502bbe2b550e126a
parentd9490685fd5311c59ad4194ea162a42a0ca6e8b8
parent6ff7b0e81b2f09394037ce80213e367f929fb624
Merge branch 'master' of ssh://git-annex.branchable.com