tree bb1b80cca9e3d46d87dec7f150d4b9cf11b1ead7
parent 8c23b6fae2e5cd8475885b015f0bb992d19921db
parent ee3d299e93450586d12f099913261ec22849365a
author Junio C Hamano <junkio@cox.net> 1137388332 -0800
committer Junio C Hamano <junkio@cox.net> 1137388332 -0800

Merge branch 'fixo/1.0'