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: (60 commits)
  archive: simplify archive format guessing
  Fix invalid read in quote_c_style_counted
  docs: fix filter-branch example for quoted paths
  t9501: Re-fix max load test
  bash: support the --autosquash option for rebase
  t9501: Skip testing load if we can't detect it
  Update draft release notes to 1.7.0
  Update git fsck --full short description to mention packs
  Revert 30816237 and 7e62265
  git-svn: persistent memoization
  fast-import: count --max-pack-size in bytes
  update git-repack documentation wrt repack.UseDeltaBaseOffset
  git-clean: fix the description of the default behavior
  fast-import.c: Fix big-file-threshold parsing bug
  make --max-pack-size argument to 'git pack-object' count in bytes
  pack-objects: fix pack generation when using pack_size_limit
  fix multiple issues with t5300
  gitweb: Simplify (and fix) chop_str
  gitk: Fix copyright symbol in About box message
  grep: simplify assignment of ->fixed
  ...