Merge tag 'v2.4.0'

Merge tag 'v2.4.0'

Git 2.4

* tag 'v2.4.0': (426 commits)
  Git 2.4
  Update git-multimail to version 1.0.2
  Git 2.3.7
  status: document the -v/--verbose option
  RelNotes: wordsmithing
  RelNotes: refer to the rebase -i "todo list", not "insn sheet"
  RelNotes: correct name of versionsort.prereleaseSuffix
  git tag: mention versionsort.prereleaseSuffix in manpage
  Git 2.4.0-rc3
  Git 2.3.6
  RelNotes: "merge --quiet" change has been reverted
  Hopefully the last batch for 2.4
  git-gui: set version 0.20
  git-gui: sv.po: Update Swedish translation (547t0f0u)
  git-gui i18n: Updated Bulgarian translation (547t,0f,0u)
  rev-list-options.txt: complete sentence about notes matching
  Revert "merge: pass verbosity flag down to merge-recursive"
  Git 2.4.0-rc2
  CodingGuidelines: update 'rough' rule count
  grep: correctly initialize help-all option
  ...

Conflicts:
	Documentation/config.txt
	Documentation/git-apply.txt
	GIT-VERSION-GEN
	Makefile
	builtin/apply.c
	t/t4008-diff-break-rewrite.sh
	transport.h