Merge branch 'master' into tor
authorJoey Hess <joeyh@joeyh.name>
Sat, 19 Nov 2016 00:05:34 +0000 (20:05 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 19 Nov 2016 00:05:34 +0000 (20:05 -0400)
commit9d9d1fdcd43012a3ef35a538bdf9fe5043b3dc46
tree8a22d37a124c64806460db51ff8dd4736ec9fef6
parent73a6b9b51455f2ae8483a86a98e9863fffe9ebac
parentc45ec7b81994a2394c6d168c3271abd9e88f34b9
Merge branch 'master' into tor
git-annex.cabal