Merge branch 'master'
commit6eb668df76a5b46bd24c25d227bfdba12542b05a
authorJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 08:11:28 +0000 (18 00:11 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 18 Nov 2005 08:11:28 +0000 (18 00:11 -0800)
treeefbfbad73fbbb0a5a363bdaf30a2e3d3dfe0abc7
parent1e9eb2e93747d2ee3fb44a5a2c8a48e7d19819b9
parent087b6742fcab74f7a53626b98969bed27d288e2b
Merge branch 'master'
Makefile