From 62d15a1e62e0ed79f3d40d07dbd270f5baf82cd5 Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Sun, 13 Nov 2011 20:02:46 +0100
Subject: [PATCH] Update AUTHORS and .mailmap

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

diff --git a/.mailmap b/.mailmap
index 2d608f95..accc9621 100644
--- a/.mailmap
+++ b/.mailmap
@@ -8,3 +8,4 @@ San-Tai Hsu <vanilla@fatpipi.com>
 Isaac Z. Schlueter <i@izs.me>
 Saúl Ibarra Corretgé <saghul@gmail.com>
 Yuki OKUMURA <mjt@cltn.org>
+Frank Denis <github@pureftpd.org>
diff --git a/AUTHORS b/AUTHORS
index 2d43c366..16f88934 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -30,4 +30,6 @@ Saúl Ibarra Corretgé <saghul@gmail.com>
 Felix Geisendörfer <felix@debuggable.com>
 Yuki OKUMURA <mjt@cltn.org>
 Roman Shtylman <shtylman@gmail.com>
-Frank DENIS <github@pureftpd.org>
+Frank Denis <github@pureftpd.org>
+Carter Allen <CarterA@opt-6.com>
+Tj Holowaychuk <tj@vision-media.ca>