Merge branch 'fixes'
commitd06b689a933f6d2130f8afdf1ac0ddb83eeb59ab
authorJunio C Hamano <junkio@cox.net>
Wed, 12 Oct 2005 05:04:11 +0000 (11 22:04 -0700)
committerJunio C Hamano <junkio@cox.net>
Wed, 12 Oct 2005 05:04:11 +0000 (11 22:04 -0700)
tree8a27f6b69b7bd37661d6b9b64367b3f57ee35ee1
parent128af9d1ef6c26b94d14c4dd0028c5dda8d6dd82
parentdf73e9c62a9f0e6cdf20f095b99abf32c8e65c75
Merge branch 'fixes'