git-annex.
Merge branch 'master' of github.com:cassiel/nemacs