Merge branch 'master' into s3-aws-multipart

This commit is contained in:
Joey Hess 2014-11-03 16:05:03 -04:00
commit a3ec6ed73b
62 changed files with 1004 additions and 79 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20141025) UNRELEASED; urgency=medium
* Windows: Fix crash when user.name is not set in git config.
-- Joey Hess <joeyh@debian.org> Fri, 31 Oct 2014 16:13:43 -0400
git-annex (5.20141024) unstable; urgency=medium
* vicfg: Deleting configurations now resets to the default, where