Merge branch 'master' into smudge

diff --cc debian/changelog
index ed1e32b735d855b763a574656b8069b52a29446a,e12c9a5fea3eaecb90bbf0d8e8df0de92b329474..e3ee9a34ad8c763dc0bd0bfcf6a0b3cfefaafd72
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,9 +1,23 @@@
 +git-annex (6.20151225) unstable; urgency=medium
 +
 +  * annex.version increased to 6, but version 5 is also still supported.
 +  * The upgrade to version 6 is not done fully automatically, because
 +    upgrading a direct mode repository to version 6 will prevent old
 +    versions of git-annex from working in other clones of that repository.
 +  * smudge: New command, used for git smudge filter. 
 +    This will replace direct mode.
 +  * init: Configure .git/info/attributes to use git-annex as a smudge
 +    filter. Note that this changes the default behavior of git add in a
 +    newly initialized repository; it will add files to the annex.
 + 
 + -- 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.