Merge branch 'maint' to sync with 1.5.6.3

* maint:
  GIT 1.5.6.3
  git-am: Do not exit silently if committer is unset
  t0004: fix timing bug
  git-mailinfo: document the -n option
  Fix backwards-incompatible handling of core.sharedRepository

diff --cc Documentation/git-mailinfo.txt
index cc52db3befda556a92b225539de0a9b95a1bf96c,1e126f4a5c82d5b3829d9826f613a376590c54d8..316bcc679628c47c9734e0906665ce5f6e8e68fb
--- 1/Documentation/git-mailinfo.txt
--- 2/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@@ -8,7 -8,7 +8,7 @@@ git-mailinfo - Extracts patch and autho
  
  SYNOPSIS
  --------
- 'git mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
 -'git-mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
++'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
  
  
  DESCRIPTION

diff --cc Documentation/git.txt
Simple merge

diff --cc path.c
Simple merge