Merge tag 'v1.9.2' into fc/master

Merge tag 'v1.9.2' into fc/master

Git 1.9.2

* tag 'v1.9.2': (39 commits)
  Git 1.9.2
  doc/http-backend: missing accent grave in literal mark-up
  Update draft release notes to 1.9.2
  Start preparing for 1.9.1
  update-ref: fail create operation over stdin if ref already exists
  t4212: loosen far-in-future test for AIX
  date: recognize bogus FreeBSD gmtime output
  code and test: fix misuses of "nor"
  comments: fix misuses of "nor"
  contrib: fix misuses of "nor"
  Documentation: fix misuses of "nor"
  diff-no-index: correctly diagnose error return from diff_opt_parse()
  fetch: handle overlaping refspecs on --prune
  status: disable translation when --porcelain is used
  test-lib.sh: do not "echo" caller-supplied strings
  run-command: mark run_hook_with_custom_index as deprecated
  merge hook tests: fix and update tests
  merge: fix GIT_EDITOR override for commit hook
  commit: fix patch hunk editing with "commit -p -m"
  test patch hunk editing with "commit -p -m"
  ...

Conflicts:
	GIT-VERSION-GEN
	Makefile