Merge with master.
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 01:02:39 +0000 (18:02 -0700)
This merges commit
3c4e8a636f4de3668b24d0020df731cdc78ae6e9
from master into our head commit
80f45687f44b6258b0eacae6b1ae15e3ad4a6552

Sincerely,
jit-merge command.

1  2 
Makefile
diff --cc Makefile
Simple merge