Merge branch 'maint-1.5.1' into maint
authorJunio C Hamano <junkio@cox.net>
Wed, 23 May 2007 07:15:35 +0000 (00:15 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 23 May 2007 07:15:35 +0000 (00:15 -0700)
* maint-1.5.1:
  Document branch.autosetupmerge.

1  2 
Documentation/config.txt

Simple merge