Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-11 13:50:31 -04:00
commit c608a752a5
Failed to extract signature
13 changed files with 163 additions and 26 deletions

3
debian/changelog vendored
View file

@ -17,6 +17,9 @@ git-annex (6.20151225) unstable; urgency=medium
git-annex (5.20151209) UNRELEASED; urgency=medium
* Add S3 features to git-annex version output.
* webdav: When testing the WebDAV server, send a file with content.
The empty file it was sending tickled bugs in some php WebDAV server.
* fsck: Failed to honor annex.diskreserve when checking a remote.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400