mailmap: unify on James

diff --git a/.mailmap b/.mailmap
index a67f6e6b5748f86bfa1cd859ded9580289ed7729..e89e3860561e9f7f9cbb05134be6147a8a745bd1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -65,7 +65,8 @@ Jessa Chandler <jessachandler@gmail.com>
 Gökhan Şengün <gsengun@linux-5d7d.site> <gokhansengun@gmai.com>
 Svyatoslav Mishyn <juef@openmailbox.org>
 Douglas Steinwand <dzs-curl@dzs.fx.org>
-James Fuller <jim@webcomposite.com>
+James Fuller <jim@webcomposite.com> <jfuller@redhat.com>
+James Fuller <jim@webcomposite.com> Jim Fuller <jim@webcomposite.com>
 Don J Olmstead <don.j.olmstead@gmail.com>
 Nicolas Sterchele <sterchelen@gmail.com>
 Sergey Raevskiy <ccik@inbox.ru>

diff --git a/docs/THANKS b/docs/THANKS
index 553506c88dcc4819557aa45659f0441da18c98ba..5003c552ebafc1caf38af81662f686f9af5ae834 100644 (file)
--- a/docs/THANKS
+++ b/docs/THANKS
@@ -1492,7 +1492,6 @@ Jilayne Lovejoy
 Jim Beveridge
 Jim Drash
 Jim Freeman
-Jim Fuller
 Jim Hollinger
 Jim King
 Jim Meyering