Merge branch 'master' of git://git.kernel.org/pub/scm/git/git

Merge branch 'master' of git://git./git/git

* 'master' of git://git.kernel.org/pub/scm/git/git: (76 commits)
  builtin-apply.c: get rid of an unnecessary use of temporary array
  builtin-pack-objects.c: avoid vla
  Style fixes, add a space after if/for/while.
  fix approxidate parsing of relative months and years
  tests: add date printing and parsing tests
  refactor test-date interface
  Add date formatting and parsing functions relative to a given time
  GIT 1.6.4.2
  UI consistency: allow --force for where -f means force
  update-server-info: make builtin, use parseopt
  Remove unused t/t8005/iso8859-5.txt
  Draft release notes to 1.6.5 before -rc0
  http.c: set slot callback members to NULL when releasing object
  t/test-lib.sh: provide a shell implementation of the 'yes' utility
  Fix overridable written with an extra 'e'
  Documentation: git-archive: mark --format as optional in summary
  Round-down years in "years+months" relative date view
  gitweb: add t9501 tests for checking HTTP status codes
  gitweb: split test suite into library and tests
  commit.c: rename variable named 'n' which masks previous declaration
  ...