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)
1  2 
git-annex.cabal

diff --cc git-annex.cabal
Simple merge