Authors: Update AUTHORS.txt and .mailmap

diff --git a/.mailmap b/.mailmap
index 63d042714b030862048f34c3f529ffbb74ff302a..c28005fe0621ddb1d12f8c4f80c3a439e22d72f1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -13,6 +13,7 @@ Carl Danley <carldanley@gmail.com>
 Carl Fürstenberg <azatoth@gmail.com>
 Carl Fürstenberg <azatoth@gmail.com> <carl@excito.com>
 Charles McNulty <cmcnulty@kznf.com>
+Christopher Jones <chris@cjqed.com> cjqed <christopherjonesqed@gmail.com>
 Colin Snover <github.com@zetafleet.com> <colin@alpha.zetafleet.com>
 Corey Frang <gnarf37@gmail.com> <gnarf@gnarf.net>
 Dan Heberden <danheberden@gmail.com>

diff --git a/AUTHORS.txt b/AUTHORS.txt
index f0f9ab66bb03a3b1e05377865ffd031455d75a3f..f5c06a6d248006aeb98bbfa91f2b3b9fc533e50a 100644 (file)
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -214,3 +214,4 @@ hongymagic <d.hong@me.com>
 John Paul <john@johnkpaul.com>
 Jakob Stoeck <jakob@pokermania.de>
 Christopher Jones <chris@cjqed.com>
+Forbes Lindesay <forbes@lindesay.co.uk>