From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 19 Sep 2007 10:21:35 +0000 (-0700)
Subject: Merge branch 'maint' to sync with 1.5.3.2
X-Git-Tag: v1.5.4-rc0~425
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=077d6f72c7db84d2b6b3db879e3d68ab60482d43;p=git.git

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>
---

077d6f72c7db84d2b6b3db879e3d68ab60482d43
diff --cc Documentation/git.txt
index a7cd91acc,a7cd91acc..cb59639f7
--- a/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