Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-15 12:01:21 -04:00
commit f5d4ee9b63
Failed to extract signature
3 changed files with 9 additions and 0 deletions

View file

@ -0,0 +1,7 @@
New special remote alert! Chris Kastorff has made
[a special remote supporting Backblaze's B2 storage servie](https://github.com/encryptio/git-annex-remote-b2).
And I'm still working on v6 unlocked files. After beating on it for 2 more
days, all git-annex commands should support them. There is still plenty
of work to do on testing, upgrading, optimisation, merge conflict resolution,
and reconciling staged changes.