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: (95 commits)
  add, merge, diff: do not use strcasecmp to compare config variable names
  Update draft release notes to 1.7.6
  Prepare for 1.7.5.2
  t5400: Fix a couple of typos
  Tweak t3102-ls-tree-wildcards to run on Windows
  Update draft release notes to 1.7.6
  Do not strip empty lines / trailing spaces from a commit message template
  t1507: avoid "${parameter<op>'word'}" inside double-quotes
  t3701: add-p-fix makes the last test to pass
  rerere: libify rerere_clear() and rerere_gc()
  Remove gitweb/gitweb.cgi and other legacy targets from main Makefile
  git-instaweb: Simplify build dependency on gitweb
  tests: teach verify_parents to check for extra parents
  merge: make branch.<name>.mergeoptions correctly override merge.<option>
  tests: eliminate unnecessary setup test assertions
  Update draft release notes to 1.7.6
  Remove duplicated "is a"
  fast-import: fix option parser for no-arg options
  send-pack: unbreak push over stateless rpc
  git-reset.txt: better docs for '--patch'
  ...