Merge branch 'master' into smudge

diff --cc debian/changelog
index 5fde37c88edb5d0a412e60fd3611404991fa985a,80a44c175179bec83c718a6041b2adff28e44f30..87affe138a10d6a59c16fa21f4ba97e964cbff00
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,5 +1,15 @@@
- git-annex (6.20151117) UNRELEASED; 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 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.
++
+ git-annex (5.20151117) UNRELEASED; urgency=medium
+ 
    * Build with -j1 again to get reproducible build.
    * Display progress meter in -J mode when copying from a local git repo,
      to a local git repo, and from a remote git repo.