Merge branch 'maint'

* maint:
  Start preparing Release Notes for 1.5.0.3
  Documentation: git-remote add [-t <branch>] [-m <branch>] [-f] name url
  Include config.mak in doc/Makefile
  git.el: Set the default commit coding system from the repository config.
  git-archimport: support empty summaries, put summary on a single line.
  http-push.c::lock_remote(): validate all remote refs.
  git-cvsexportcommit: don't cleanup .msg if not yet committed to cvs.

diff --cc Documentation/git-remote.txt
index 266faade31ae646a419616fc0fce9d676f112d9d,f96b30429c8d970a2eaabe4a1f3b162ce48a9cee..a9fb6a9a5ef3cfeffa37578b4d703ca75c73f306
--- 1/Documentation/git-remote.txt
--- 2/Documentation/git-remote.txt
+++ b/Documentation/git-remote.txt
@@@ -10,10 -10,9 +10,10 @@@ SYNOPSI
  --------
  [verse]
  'git-remote'
- 'git-remote' add <name> <url>
+ 'git-remote' add [-t <branch>] [-m <branch>] [-f] <name> <url>
  'git-remote' show <name>
  'git-remote' prune <name>
 +'git-remote' update [group]
  
  DESCRIPTION
  -----------

diff --cc git-cvsexportcommit.perl
Simple merge

diff --cc http-push.c
Simple merge