Merge branch 'maint' to synchronize with 1.5.3.6

* maint:
GIT 1.5.3.6
grep -An -Bm: fix invocation of external grep command

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

diff --cc Documentation/git.txt
index 6db7ae1ea7073ecef07430f13d6bf88758c922ff,a7cd91acc1c6551918d54158a1c76321157e97fa..546020100a533b99126adb1635299e7d025bca4b
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -46,12 -46,7 +46,13 @@@ 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.1.txt[1.5.3.1].
++  link:RelNotes-1.5.3.6.txt[1.5.3.6],
 +  link:RelNotes-1.5.3.5.txt[1.5.3.5],
 +  link:RelNotes-1.5.3.4.txt[1.5.3.4],
 +  link:RelNotes-1.5.3.3.txt[1.5.3.3],
 +  link:RelNotes-1.5.3.2.txt[1.5.3.2],
 +  link:RelNotes-1.5.3.1.txt[1.5.3.1],
 +  link:RelNotes-1.5.3.txt[1.5.3].
  
  * release notes for
    link:RelNotes-1.5.2.5.txt[1.5.2.5],