Merge branch 'maint' to sync with 1.5.3.2

This is an evil merge that also updates the stale document links
in Documentation/git.txt

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --cc Documentation/git.txt
index a7cd91acc1c6551918d54158a1c76321157e97fa,a7cd91acc1c6551918d54158a1c76321157e97fa..cb59639f777889cb909933886d31ebcce1bbd199
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -46,6 -46,6 +46,7 @@@ Documentation for older releases are av
  * link:v1.5.3/git.html[documentation for release 1.5.3]
  
  * release notes for
++  link:RelNotes-1.5.3.2.txt[1.5.3.2],
    link:RelNotes-1.5.3.1.txt[1.5.3.1].
  
  * release notes for