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

diff --cc Makefile
Simple merge