Merge branch 'master' into smudge

diff --cc debian/changelog
index f323b4b5afe62a7da32d2b455c7ae2e2d8472e87,34e106d39a3a6b1070434ec0d79635b708696d9d..0488c2eb11b9bb77797ff5704a89622d01802a5a
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,14 +1,33 @@@
- git-annex (5.20151209) UNRELEASED; urgency=medium
 +git-annex (6.20151225) unstable; urgency=medium
 +
 +  * Added v6 repository mode, but v5 is still the default for now.
 +  * 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.
 +  * unlock, lock: In v6 mode, unlocking a file changes it from a symlink to a
 +    pointer file, and this change can be committed to the git repository.
 +  * add: In v6 mode, adds modified files to the annex.
 +  * init: --version parameter added to control which supported repository
 +    version to use.
 + 
 + -- Joey Hess <id@joeyh.name>  Tue, 08 Dec 2015 11:14:03 -0400
 +
+ git-annex (5.20151219) UNRELEASED; urgency=medium
+ 
+   * status: On crippled filesystems, was displaying M for all annexed files
+     that were present. Probably caused by a change to what git status
+     displays in this situation. Fixed by treating files git thinks are
+     modified the same as typechanged files.
+   * addurl: Added --batch option. 
+ 
+  -- Joey Hess <id@joeyh.name>  Sat, 19 Dec 2015 13:31:17 -0400
+ 
+ git-annex (5.20151218) unstable; urgency=medium
  
    * Add S3 features to git-annex version output.
    * webdav: When testing the WebDAV server, send a file with content.