Merge git://repo.or.cz/darcs2git
authorHan-Wen Nienhuys <hanwen@lilypond.org>
Fri, 25 May 2007 02:33:26 +0000 (23:33 -0300)
committerHan-Wen Nienhuys <hanwen@lilypond.org>
Fri, 25 May 2007 02:33:26 +0000 (23:33 -0300)
commita41c60180911689cdb0c97cab696f5fc490ae2f5
tree8e80b6dbf162a73cc60c6a9a64869ac791a08c9a
parentdffefd3378dc0e414640fe9bc44ca4e59bafcabb
parent94de2fc9fd447ffb32189e043109ed2aebcf25e0
Merge git://repo.or.cz/darcs2git

Conflicts:

darcs2git.py
darcs2git.py