Code

Merge branch 'master'
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 02:23:45 +0000 (18:23 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 02:23:45 +0000 (18:23 -0800)
1  2 
Makefile

diff --cc Makefile
Simple merge