From 7cfd1bf1fc6a1533a6472f4698de6e9dd98efc91 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 18 Mar 2013 18:34:19 -0700
Subject: [PATCH] update AUTHORS

Change-Id: I8d90f49439c04f86e8570ecca25e18339cb46917
---
 .mailmap | 4 ++++
 AUTHORS  | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 9df561b2..8f9505dc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,2 +1,6 @@
+<johann.koenig@duck.com> <johannkoenig@google.com>
 Mikołaj Zalewski <mikolajz@google.com>
 Pascal Massimino <pascal.massimino@gmail.com>
+Vikas Arora <vikasa@google.com>
+<vikasa@google.com> <vikasa@gmail.com>
+<vikasa@google.com> <vikaas.arora@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index c6ea612b..df11a6ed 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,9 +1,10 @@
 Contributors:
 - James Zern (jzern at google dot com)
 - Jan Engelhardt (jengelh at medozas dot de)
-- Johann (johannkoenig at google dot com)
+- Johann (johann dot koenig at duck dot com)
 - Jyrki Alakuijala (jyrki at google dot com)
 - Lou Quillio (louquillio at google dot com)
+- Mans Rullgard (mans at mansr dot com)
 - Martin Olsson (mnemo at minimum dot se)
 - Mikołaj Zalewski (mikolajz at google dot com)
 - Noel Chromium (noel at chromium dot org)