Sync with 1.5.4.3

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

diff --cc Documentation/git.txt
index d57bed618fa6be93be64c19a9f6d8a6bc51a5d49,17aee93ec5c89e1f1d0d499acaf08bf3cc300662..741ae0e4c8ec9a3aaaef19430b0f76e4baedb546
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -43,11 -43,9 +43,12 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
- * link:v1.5.4.2/git.html[documentation for release 1.5.4.2]
 -* link:v1.5.4/git.html[documentation for release 1.5.4]
++* link:v1.5.4.3/git.html[documentation for release 1.5.4.3]
  
  * release notes for
++  link:RelNotes-1.5.4.3.txt[1.5.4.3],
 +  link:RelNotes-1.5.4.2.txt[1.5.4.2],
 +  link:RelNotes-1.5.4.1.txt[1.5.4.1],
    link:RelNotes-1.5.4.txt[1.5.4].
  
  * link:v1.5.3.8/git.html[documentation for release 1.5.3.8]

diff --cc GIT-VERSION-GEN
Simple merge

diff --cc git-gui/git-gui.sh
Simple merge