Merge branch 'master' of git://git./git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (104 commits)
Fix git {log,show,...} --pretty=email
Don't yap about merge-subtree during make
sscanf/strtoul: parse integers robustly
Add testcase for format-patch --subject-prefix (take 3)
Add custom subject prefix support to format-patch (take 3)
GIT 1.5.1.1
cvsserver: Fix handling of diappeared files on update
fsck: do not complain on detached HEAD.
(encode_85, decode_85): Mark source buffer pointer as "const".
gitweb: Allow configuring the default projects order and add order 'none'
gitweb: Allow forks with project list file
Documentation: show-ref: document --exclude-existing
cvsexportcommit -p : fix the usage of git-apply -C.
git-archive: make tar the default format
Add Documentation/cmd-list.made to .gitignore
git-svn: fix log command to avoid infinite loop on long commit messages
git-svn: dcommit/rebase confused by patches with git-svn-id: lines
git-svn: bail out on incorrect command-line options
Start 1.5.2 cycle by prepareing RelNotes for it.
Prepare for 1.5.1.1
...