From eec2398cecdc8b5444690844ac8502e935b66d1a Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Wed, 18 Dec 2013 19:09:11 -0800
Subject: [PATCH] update AUTHORS & .mailmap

Change-Id: I5419731cd7ac6a06e42ef12433286a97e8e13bb4
---
 .mailmap | 1 +
 AUTHORS  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index 8f9505dc..55b00c69 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,6 +1,7 @@
 <johann.koenig@duck.com> <johannkoenig@google.com>
 Mikołaj Zalewski <mikolajz@google.com>
 Pascal Massimino <pascal.massimino@gmail.com>
+<pascal.massimino@gmail.com> <skal@google.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 9ef75042..817950fe 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
 Contributors:
+- Charles Munger (clm at google dot com)
 - Christian Duvivier (cduvivier at google dot com)
 - James Zern (jzern at google dot com)
 - Jan Engelhardt (jengelh at medozas dot de)