From d157b669b7b5d3208a2369c4ed9d0b159bb63d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= <scott.gonzalez@gmail.com>
Date: Wed, 6 Aug 2014 08:22:10 -0400
Subject: [PATCH] Authors: Update

---
 .mailmap    | 1 +
 AUTHORS.txt | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index e0dd92c78..59afcbc1b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -110,5 +110,6 @@ Ting Kuei <ting@kuei.com>
 Todd Parker <todd@filamentgroup.com> <fg.todd@gmail.com>
 Wesley Walser <waw325@gmail.com> <wwalser@atlassian.com>
 Xavi Ramirez <xavi.rmz@gmail.com>
+Yermo Lamers <yml@yml.com>
 Yuriy Khabarov <13real008@gmail.com> <yuriy@tokyoscale.com>
 Ziling Zhao <zilingzhao@gmail.com> <zizhao@cisco.com>
diff --git a/AUTHORS.txt b/AUTHORS.txt
index e951ebdfd..e78fece27 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -271,6 +271,10 @@ Thomas Meyer <meyertee@gmail.com>
 Ruslan Yakhyaev <ruslan@ruslan.io>
 Brian J. Dowling <bjd-dev@simplicity.net>
 Ben Higgins <ben@extrahop.com>
-Yermo <yml@yml.com>
+Yermo Lamers <yml@yml.com>
 Patrick Stapleton <github@gdi2290.com>
 Trisha Crowley <trisha.crowley@gmail.com>
+Usman Akeju <akeju00+github@gmail.com>
+Rodrigo Menezes <rod333@gmail.com>
+Jacques Perrault <jacques_perrault@us.ibm.com>
+Frederik Elvhage <frederik.elvhage@googlemail.com>