Code

Merge branch 'fixes'
authorJunio C Hamano <junkio@cox.net>
Sat, 15 Oct 2005 18:23:28 +0000 (11:23 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 15 Oct 2005 18:23:28 +0000 (11:23 -0700)
commit2482d7d0ecfe70a14b450e7028954f3b676f477a
treef2aec7de9418613d1ec2e35363cdc368c1cd2c02
parent7882213298f73dde1f9b6908b35211fac1756e7e
parent5990efb0c4f6d1a19c4702bf50ef8cc5ac902a78
Merge branch 'fixes'