Merge branch 'master' into s3

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-03-28 16:34:58 -04:00
commit 996e5eee01
6 changed files with 46 additions and 1 deletions

2
debian/changelog vendored
View file

@ -3,6 +3,8 @@ git-annex (0.20110329) UNRELEASED; urgency=low
* Amazon S3 is now supported as a special type of remote.
Warning: Encrypting data before sending it to S3 is not currently
supported.
* fsck: Ensure that files and directories in .git/annex/objects
have proper permissions.
-- Joey Hess <joeyh@debian.org> Sat, 26 Mar 2011 14:36:16 -0400