From e4b5002490a0ae9df972ed3715b80634a96cc69b Mon Sep 17 00:00:00 2001
From: John Koleszar <jkoleszar@google.com>
Date: Thu, 2 Sep 2010 13:40:43 -0400
Subject: [PATCH] Update AUTHORS

Change-Id: I0395ffa107651a773fd11d12682ab9372f76a90b
---
 .mailmap |  2 ++
 AUTHORS  | 10 ++++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 .mailmap

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 000000000..f77ff26e4
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Adrian Grange <agrange@google.com>
+Johann Koenig <johannkoenig@google.com>
diff --git a/AUTHORS b/AUTHORS
index 9715f0071..6708d5aa9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,16 +1,26 @@
 # This file is automatically generated from the git commit history
 # by tools/gen_authors.sh.
 
+Adrian Grange <agrange@google.com>
 Alex Converse <alex.converse@gmail.com>
 Andres Mejia <mcitadel@gmail.com>
 Fabio Pedretti <fabio.ped@libero.it>
 Frank Galligan <fgalligan@google.com>
+Fredrik Söderquist <fs@opera.com>
+Fritz Koenig <frkoenig@google.com>
+Giuseppe Scrivano <gscrivano@gnu.org>
 Guillermo Ballester Valor <gbvalor@gmail.com>
 James Zern <jzern@google.com>
+Jan Kratochvil <jan.kratochvil@redhat.com>
+Jeff Muizelaar <jmuizelaar@mozilla.com>
+Jim Bankoski <jimbankoski@google.com>
+Johann Koenig <johannkoenig@google.com>
 John Koleszar <jkoleszar@google.com>
 Justin Clift <justin@salasaga.org>
+Justin Lebar <justin.lebar@gmail.com>
 Luca Barbato <lu_zero@gentoo.org>
 Makoto Kato <makoto.kt@gmail.com>
+Michael Kohler <michaelkohler@live.com>
 Paul Wilkins <paulwilkins@google.com>
 Pavol Rusnak <stick@gk2.sk>
 Philip Jägenstedt <philipj@opera.com>