Merge remote-tracking branch 'origin/master' into assistant

Conflicts:
	Init.hs
This commit is contained in:
Joey Hess 2012-08-05 15:05:30 -04:00
commit 0833eb43a6
6 changed files with 64 additions and 16 deletions

1
debian/changelog vendored
View file

@ -4,6 +4,7 @@ git-annex (3.20120722) UNRELEASED; urgency=low
that its config is valid.
* 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.
-- Joey Hess <joeyh@debian.org> Fri, 27 Jul 2012 21:04:47 -0400