Merge branch 'maint' to sync with 1.6.0.1

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git.txt
index 1bc295dd547b5375fb7c915efbc91de9130aea2c,363a785452ec13c3e8bd8bd744eb4a4db7fcc991..e178fb581323adaa5f490fb67732f98147ec460f
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,9 -43,9 +43,10 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
--* link:v1.6.0/git.html[documentation for release 1.6.0]
++* link:v1.6.1/git.html[documentation for release 1.6.1]
  
  * release notes for
++  link:RelNotes-1.6.1.txt[1.6.1],
    link:RelNotes-1.6.0.txt[1.6.0].
  
  * link:v1.5.6.5/git.html[documentation for release 1.5.6.5]

diff --cc Makefile
Simple merge

diff --cc builtin-merge.c
Simple merge

diff --cc combine-diff.c
Simple merge

diff --cc t/t4015-diff-whitespace.sh
Simple merge