Merge origin.
commit5e926eed9fb8746e762bdb147f35d44c7a65321e
authorHan-Wen Nienhuys <hanwen@google.com>
Wed, 23 May 2007 21:49:35 +0000 (23 18:49 -0300)
committerHan-Wen Nienhuys <hanwen@google.com>
Wed, 30 May 2007 16:46:25 +0000 (30 13:46 -0300)
tree2e41bae8451b737a4ffe2fa28a94ca39123d81a3
parentbb6e09b27afeaae780dabfda7a07d59fc7efc4cf
parentcfeb59be256bf9cd2853ed04d4af056b2f0eff31
Merge origin.
contrib/fast-import/git-p4