Merge branch 'maint-1.6.3' into maint

* maint-1.6.3:
  Change mentions of "git programs" to "git commands"
  Documentation: merge: one <remote> is required
  help.c: give correct structure's size to memset()

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-rev-list.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge

diff --cc help.c
Simple merge