Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Tue, 7 Mar 2006 04:58:41 +0000 (20:58 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 7 Mar 2006 04:58:41 +0000 (20:58 -0800)
* master:
Merge branch 'sp/checkout'
Merge branch 'fd/asciidoc'
Allow format-patch to attach patches
Allow adding arbitary lines in the mail header generated by format-patch.

Trivial merge