Code

Merge branch 'fixo/1.0'
authorJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:12:12 +0000 (21:12 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 16 Jan 2006 05:12:12 +0000 (21:12 -0800)
commit7cb038a692ec0bdc0f442380678e8e87e26d4e68
treebb1b80cca9e3d46d87dec7f150d4b9cf11b1ead7
parent8c23b6fae2e5cd8475885b015f0bb992d19921db
parentee3d299e93450586d12f099913261ec22849365a
Merge branch 'fixo/1.0'