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:
  git-p4: Fix indentation from tab to spaces
  gitattributes: fix relative path matching
  config: add test cases for empty value and no value config variables.
  Improve bash prompt to detect various states like an unfinished merge
  Fix parsing numeric color values
  gitweb: Make feed entries point to commitdiff view
  git-svn: improve repository URL matching when following parents
  Make git-remote.perl "use strict" compliant
  INSTALL: git-merge no longer uses cpio
  Fix misuse of prefix_path()
  man pages are littered with .ft C and others
  Add a BuildRequires for gettext in the spec file.
  Test :/string form for checkout
  fix misuse of prefix_path()