Merge branch 'master' into assistant

This commit is contained in:
Joey Hess 2012-08-07 13:31:43 -04:00
commit 7e2d07484f
15 changed files with 238 additions and 30 deletions

2
debian/changelog vendored
View file

@ -5,6 +5,8 @@ git-annex (3.20120722) UNRELEASED; urgency=low
* init: If no description is provided for a new repository, one will
automatically be generated, like "joey@gnu:~/foo"
* unused, status: Avoid crashing when ran in bare repo.
* Avoid crashing when "git annex get" fails to download from one
location, and falls back to downloading from a second location.
-- Joey Hess <joeyh@debian.org> Fri, 27 Jul 2012 21:04:47 -0400