Merge branch 'origin'
[git.git] / info / main / mailmap
2005-11-05 Junio C HamanoAdd Meta information.