Merge tag 'v1.8.5' into fc/master

Merge tag 'v1.8.5' into fc/master

Git 1.8.5

* tag 'v1.8.5': (510 commits)
  Git 1.8.5
  remote-hg: don't decode UTF-8 paths into Unicode objects
  Git 1.8.5-rc3
  Git 1.8.4.4
  RelNotes: spelling & grammar fixes
  remote-hg: don't decode UTF-8 paths into Unicode objects
  branch: fix --verbose output column alignment
  Revert "upload-pack: send non-HEAD symbolic refs"
  Git 1.8.5-rc2
  Correct word usage of "timezone" in "Documentation" directory
  l10n: de.po: improve error message when pushing to unknown upstream
  l10n: de.po: translate 68 new messages
  po/TEAMS: update Thomas Rast's email address
  l10n: Update Swedish translation (2194t0f0u)
  l10n: fr.po 2194/1294 messages translated
  Git 1.8.4.3
  Start preparing for 1.8.4.3
  gitignore.txt: fix documentation of "**" patterns
  Git 1.8.5-rc1
  Update draft release notes to 1.8.5
  ...

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Conflicts:
	Documentation/git-push.txt
	Documentation/gitremote-helpers.txt
	GIT-VERSION-GEN
	builtin/apply.c
	builtin/branch.c
	builtin/fast-export.c
	builtin/fetch.c
	builtin/reset.c
	builtin/rm.c
	fast-import.c
	git-pull.sh
	git-remote-bzr.py
	git-remote-hg.py
	git-remote-testgit.sh
	remote.c
	t/remote-helpers/bzr.t
	t/remote-helpers/hg-bidi.t
	t/remote-helpers/hg-hg-git.t
	t/remote-helpers/hg.t
	t/t6040-tracking-info.sh
	t/t9300-fast-import.sh
	transport-helper.c