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

* maint-1.5.1:
  Document branch.autosetupmerge.
Documentation/config.txt