Merge branch 'master' into checkout

Conflicts:
	debian/changelog
	doc/backends.mdwn
This commit is contained in:
Joey Hess 2010-11-09 15:05:08 -04:00
commit 75d2925082
30 changed files with 343 additions and 151 deletions

View file

@ -4,3 +4,5 @@
> josh: Oh, I just thought of another slightly crazy but handy idea.
> josh: I'd hate to run into a program which somehow followed the symlink and then did an unlink to replace the file.
> josh: To break that, you could create a new directory under annex's internal directory for each file, and make the directory have no write permission.
[[done]] and done --[[Joey]]