Merge branch 'master' into smudge

This commit is contained in:
Joey Hess 2015-12-10 14:07:11 -04:00
commit 3d936fdb59
Failed to extract signature
11 changed files with 196 additions and 0 deletions

6
debian/changelog vendored
View file

@ -12,6 +12,12 @@ git-annex (6.20151225) unstable; urgency=medium
-- Joey Hess <id@joeyh.name> Tue, 08 Dec 2015 11:14:03 -0400
git-annex (5.20151209) UNRELEASED; urgency=medium
* Add S3 features to git-annex version output.
-- Joey Hess <id@joeyh.name> Thu, 10 Dec 2015 11:39:34 -0400
git-annex (5.20151208) unstable; urgency=medium
* Build with -j1 again to get reproducible build.