Merge branch 'fixes'
commitd92ddb525d47f11ecb6b11e795a668240d9a1af5
authorJunio C Hamano <junkio@cox.net>
Tue, 1 Nov 2005 02:08:22 +0000 (31 18:08 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 1 Nov 2005 02:08:22 +0000 (31 18:08 -0800)
tree9387072f21f19973a605134509a085093cc8fadf
parente634aec752642dcf86c3fc82025e43381d6768c2
parentbd66361195c5503261a2d1eef6aa685deb058ffb
Merge branch 'fixes'