Merge branch 'maint-1.5.1' into maint
commitbaf5597ae43398e485f63f8e9216d34b5cd0a0d6
authorJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:34:11 +0000 (23 22:34 -0700)
committerJunio C Hamano <junkio@cox.net>
Thu, 24 May 2007 05:34:11 +0000 (23 22:34 -0700)
tree33ea7dad9837b80af11f55972eec722a2d961a51
parent7ca055f75ad7ffd2251d4b607fbb86d7bcfd77c7
parent5fdcf75c68d2c382de54af4e55713ca770bb9031
Merge branch 'maint-1.5.1' into maint

* maint-1.5.1:
  Documentation: fix git-config.xml generation
Documentation/config.txt