Merge branch 'maint'
commiteb153837d8509fc6ef59b17630429c63c0993b2d
authorJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 21:38:33 +0000 (25 14:38 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 25 Oct 2006 21:38:33 +0000 (25 14:38 -0700)
tree2c6e4a895ed1fc98d5635c4e171377b2e09e44c0
parent01fe679a341ed3b1a816404faf76bf454712aa2f
parent84ab7b6fc7e190ac1c1d0bc5b7c48befa42eff3c
Merge branch 'maint'

* maint:
  Documentation/SubmittingPatches: 3+1 != 6