From: Junio C Hamano <junkio@cox.net>
Date: Mon, 27 Feb 2006 23:48:06 +0000 (-0800)
Subject: Merge branch 'kh/svnimport' into next
X-Git-Tag: v1.3.0-rc1~54^2~27
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6490603b1bb15166f4f912f04f20b0c84d6114af;p=git.git

Merge branch 'kh/svnimport' into next

* kh/svnimport:
  Save username -> Full Name <email@addr.es> map file
  Let git-svnimport's author file use same syntax as git-cvsimport's
---

6490603b1bb15166f4f912f04f20b0c84d6114af