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: (121 commits)
  plug a DIR buffer leak in rerere.c
  Update 1.7.6 draft release notes
  Git 1.7.5.3
  compat/fnmatch/fnmatch.c: give a fall-back definition for NULL
  gitweb: Refactor reading and parsing config file into read_config_file
  sh-18n: quell "unused variable" warning
  init/clone: remove short option -L and document --separate-git-dir
  doc: discuss textconv versus external diff drivers
  require-work-tree wants more than what its name says
  gitweb: Make JavaScript ability to adjust timezones configurable
  gitweb.js: Add UI for selecting common timezone to display dates
  gitweb: JavaScript ability to adjust time based on timezone
  gitweb: Unify the way long timestamp is displayed
  gitweb: Refactor generating of long dates into format_timestamp_html
  gitweb.js: Provide getElementsByClassName method (if it not exists)
  gitweb.js: Introduce code to handle cookies from JavaScript
  gitweb.js: Extract and improve datetime handling
  gitweb.js: Provide default values for padding in padLeftStr and padLeft
  gitweb.js: Update and improve comments in JavaScript files
  gitweb: Split JavaScript for maintability, combining on build
  ...