From 846e93c5d19919e830776dc56cd2225aceacf2b0 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Fri, 16 Sep 2011 14:33:38 -0700
Subject: [PATCH] Update AUTHORS & add .mailmap

Change-Id: I2dd07820cae50c85695da7c40b05780ffeef434a
---
 .gitattributes | 1 +
 .mailmap       | 2 ++
 AUTHORS        | 1 +
 3 files changed, 4 insertions(+)
 create mode 100644 .mailmap

diff --git a/.gitattributes b/.gitattributes
index 59661532..00f78b44 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 .gitattributes export-ignore
 .gitignore export-ignore
+.mailmap export-ignore
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 00000000..9df561b2
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Mikołaj Zalewski <mikolajz@google.com>
+Pascal Massimino <pascal.massimino@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 614f7c36..a5893034 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -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)