Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (75 commits)
git-annotate: fix -S on graft file with comments.
git-annotate: no need to exec blame; it is built-in now.
git-rebase: Use --ignore-if-in-upstream option when executing git-format-patch.
Documentation: move blame examples
git-svn: fix dcommit losing changes when out-of-date from svn
git-svn: don't die on rebuild when --upgrade is specified
git-svn: avoid printing filenames of files we're not tracking
Nicer error messages in case saving an object to db goes wrong
gitweb: fix unmatched div in commitdiff
gitweb: protect commit messages from controls.
gitweb: protect blob and diff output lines from controls.
git-pickaxe: retire pickaxe
git-status: quote LF in its output
gitweb: do not give blame link unconditionally in diff-tree view
gitweb: New improved patchset view
gitweb: Use character or octal escape codes (and add span.cntrl) in esc_path
gitweb: Better git-unquoting and gitweb-quoting of pathnames
gitweb: minimally fix "fork" support.
gitweb: fix disabling of "forks"
GIT 1.4.3-rc1
...