Merge with master.
authorJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 9 Aug 2005 17:22:23 +0000 (10:22 -0700)
commitedee414c3e5a546aae3dd1529f397df949713305
tree665e1e695501289a63272c3de89aed3eb555ed74
parentc3958a7926ab20b90fe0767580b466698477f5b6
parentf10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
Merge with master.

This merges commit
    f10e0e0b18c8e2e69535e7380fb3c1f9b097cfda
from master into our head commit
    c3958a7926ab20b90fe0767580b466698477f5b6

Sincerely,
    jit-merge command.
Makefile