Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sun, 6 Dec 2015 20:56:16 +0000 (16:56 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sun, 6 Dec 2015 20:56:16 +0000 (16:56 -0400)
commitbd6f694687f8d7da62c68cfb634c593774f3740f
tree068bfd1c76b3334a0a1bae75ba98d146553cfdaf
parent2936153fc43f45bd074d0f2df593c381e7d2e5e9
parent9d46da4a299ca98b196524fb54d09e63b5f858ab
Merge branch 'master' of ssh://git-annex.branchable.com