Merge tag 'v2.3.0'

Merge tag 'v2.3.0'

Git 2.3

* tag 'v2.3.0': (255 commits)
  Git 2.3
  l10n: ca.po: Fix trailing whitespace
  Git 2.3.0-rc2
  l10n: de.po: correct singular form
  l10n: de.po: translate "leave behind" correctly
  l10n: de.po: fix typo
  l10n: ca.po: update translation
  Documentation: fix version numbering
  Fix unclosed here document in t3301.sh
  l10n: correct indentation of show-branch usage
  Git 2.3.0-rc1
  show-branch: fix indentation of usage string
  parse_color: fix return value for numeric color values 0-8
  l10n: de.po: translate 3 messages
  l10n: zh_CN: various fixes on command arguments
  l10n: vi.po(2298t): Updated 3 new strings
  l10n: sv.po: Update Swedish translation (2298t0f0u)
  l10n: fr.po v2.3.0 round 2
  l10n: git.pot: v2.3.0 round 2 (3 updated)
  l10n: de.po: translate 13 new messages
  ...

Conflicts:
	GIT-VERSION-GEN
	Makefile
	builtin/branch.c
	config.c
	t/t5516-fetch-push.sh