Merge branch 'maint'
authorJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 21:38:33 +0000 (14:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 21:38:33 +0000 (14:38 -0700)
* maint:
  Documentation/SubmittingPatches: 3+1 != 6


Trivial merge