Update AUTHORS & add .mailmap

Change-Id: I2dd07820cae50c85695da7c40b05780ffeef434a
2011-09-16 14:33:38 -07:00 · 2011-09-16 14:33:38 -07:00 · 846e93c5d1
commit 846e93c5d1
parent 563e52d62e
3 changed files with 4 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -1,2 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.mailmap export-ignore
--- a/.mailmap
+++ b/.mailmap
@ -0,0 +1,2 @@
+Mikołaj Zalewski <mikolajz@google.com>
+Pascal Massimino <pascal.massimino@gmail.com>
--- a/1
+++ b/1
@ -5,4 +5,5 @@ Contributors:
 - Pascal Massimino (pascal dot massimino at gmail dot com)
 - Pierre Joye (pierre dot php at gmail dot com)
 - Somnath Banerjee (somnath dot banerjee at gmail dot com)
+- Urvang Joshi (urvang at google dot com)
 - Vikas Arora (vikasa at google dot com)