Merge branch 'master' into assistant

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2012-08-17 08:22:43 -07:00
commit dcd208513d
8 changed files with 83 additions and 9 deletions

1
debian/changelog vendored
View file

@ -1,6 +1,7 @@
git-annex (3.20120808) UNRELEASED; urgency=low
* S3: Add fileprefix setting.
* Pass --use-agent to gpg when in no tty mode. Thanks, Eskild Hustvedt.
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"