Code

Merge commit 'v1.7.5' into svn-fe
authorJonathan Nieder <jrnieder@gmail.com>
Tue, 3 May 2011 04:02:15 +0000 (23:02 -0500)
committerJonathan Nieder <jrnieder@gmail.com>
Tue, 3 May 2011 04:02:15 +0000 (23:02 -0500)
* commit 'v1.7.5': (436 commits)
  Git 1.7.5
  Git 1.7.5-rc3
  Git 1.7.4.5
  git-svn.txt: Document --mergeinfo
  Revert "run-command: prettify -D_FORTIFY_SOURCE workaround"
  ...


Trivial merge