From: Junio C Hamano <junkio@cox.net>
Date: Fri, 23 Feb 2007 11:11:52 +0000 (-0800)
Subject: .mailmap maintenance after pulling from git-svn
X-Git-Tag: v1.5.1-rc1~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/509b4d73b26bb442fd409bbca3772ba22875d310?ds=sidebyside

.mailmap maintenance after pulling from git-svn

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/.mailmap b/.mailmap
index c7a3a75f33..3a624eabc3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,6 +27,7 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>
+Sam Vilain <sam@vilain.net>
 Santi Béjar <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
 Shawn O. Pearce <spearce@spearce.org>