commit | df6a6f0e87c44ff6daab7de3fde2237555ae95ac | [log] [tgz] |
---|---|---|
author | Junio C Hamano <junkio@cox.net> | Wed Aug 10 13:20:08 2005 -0700 |
committer | Junio C Hamano <junkio@cox.net> | Wed Aug 10 13:20:08 2005 -0700 |
tree | 172f4cfa0a85fb1587a789b07d29552114c6a7f0 | |
parent | bdb71a41caa9ffed2e3207736c21fffbc2007670 [diff] | |
parent | e8c80638abc99928dba9ac832589749a531e2e21 [diff] |
Merge with master. This merges commit e8c80638abc99928dba9ac832589749a531e2e21 from master into our head commit bdb71a41caa9ffed2e3207736c21fffbc2007670 Sincerely, jit-merge command.