Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-15 12:01:21 -04:00
commit f5d4ee9b63
Failed to extract signature
3 changed files with 9 additions and 0 deletions

1
debian/changelog vendored
View file

@ -20,6 +20,7 @@ git-annex (5.20151209) UNRELEASED; urgency=medium
* 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.
* Debian: Build depend on concurrent-output.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400