Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2015 18:43:12 +0000 (14:43 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 18 Dec 2015 18:43:12 +0000 (14:43 -0400)
commitfd13d721099f3f7c258c5eded34fc1c49bbe3b9f
tree2dee1322be1e99c823b21ba4284872e8602a28bd
parentf1a73de56031055c7fc09b6d1950be4a253ab352
parent5008846f7b0e4f0412ae84a97905478438ac3884
Merge branch 'master' of ssh://git-annex.branchable.com