From 8e09e4be734bb7b42fc3889eb45da01c938c142a Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Tue, 5 Jul 2022 12:24:05 -0600
Subject: [PATCH] Update CONTRIBUTORS file

---
 cde/CONTRIBUTORS | 122 +++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 61 deletions(-)

diff --git a/cde/CONTRIBUTORS b/cde/CONTRIBUTORS
index 8d398b04f..8e1ca21e8 100644
--- a/cde/CONTRIBUTORS
+++ b/cde/CONTRIBUTORS
@@ -7,65 +7,65 @@
 # Please keep this list in order by given-name
 #
 # Generated by:
-# git log |grep '^Author: ' |cut -d' ' -f2- |sort |uniq
+# git log |grep '^Author: ' |cut -d' ' -f2- |sed -e 's/@/ at /g' |sort |uniq
 
-Adam Robinson <adamrobinson@comcast.net>
-Adam Sampson <ats@offog.org>
-Alex Ivanov <gnidorah@ya.ru>
-alx <alx@fastestcode.org>
-Anthony Perkins <anthony@muzz.co.uk>
-b'Jon Trulson <allura@localhost>
-chase <chase@localhost.com>
-Chase <nicetrynsa@protonmail.ch>
-Chris Wareham <chris@chriswareham.net>
-Cody Kotichas <ckotichas@csu.fullerton.edu>
-David Cantrell <david.l.cantrell@gmail.com>
-David Cantrell <dcantrell@redhat.com>
-David J.McBrayer <D9J0M.dev@gmail.com>
-Douglas Carmichael <dcarmich@dcarmichael.net>
-Douglas Mencken <dougmencken@gmail.com>
-Edmond Orignac <edmond.orignac@wanadoo.fr>
-Edmond ORIGNAC <Edmond.Orignac@wanadoo.fr>
-Eugene Doudine <dudinea@gmail.com>
-Frederic Koehler <f.koehler427@gmail.com>
-Giacomo Comes <comes@naic.edu>
-ibid_ag@lavabit.com <ibid_ag@lavabit.com>
-Isaac Dunham <ibid.ag@gmail.com>
-James Woodcock <james_woodcock@yahoo.co.uk>
-Jelle Hermsen <jelle@jellehermsen.nl>
-Johannes von Rotz <jr@vrtz.ch>
-Jon Trulson <allura@localhost>
-Jon Trulson <jon@radscan.com>
-Jose Rubio <joserubiovidales@gmail.com>
-Karsten Pedersen <kpedersen@hotmail.co.uk>
-Lev Kujawski <int21h@mailbox.org>
-Liang Chang <l-chang@users.sourceforge.net>
-Marc Balmer <marc@msys.ch>
-Marcin Cieslak <saper@saper.info>
-Marcin Cieślak <saper@saper.info>
-Matthew Howkins <mhowkins@users.sourceforge.net>
-Matthew R. Trower <dev@blackshard.net>
-Michael McConville <mmcco@mykolab.com>
-Mike Stroyan <mike@stroyan.net>
-Nina Didenko <nina.didenko@gmail.com>
-Pascal de Bruijn <pmjdebruijn@pcode.nl>
-Pascal Stumpf <Pascal.Stumpf@cubes.de>
-Peter Howkins <flibble@users.sf.net>
-Peter Howkins <flibble@users.sourceforge.net>
-Peter Howkins <peter@azmaria.(none)>
-Peter Howkins <peter@deb8>
-Peter Howkins <peter@debian.uk.nds.com>
-Peter Howkins <peter@vita2.home.marutan.net>
-Peter Howkins <peter@x-1204.(none)>
-Peter Howkins <peter@x1204.(none)>
-Peter Howkins <peter@xubuntu.uk.nds.com>
-Peter Tribble <peter.tribble@gmail.com>
-Robert Tomsick <robert@tomsick.net>
-Stuart Brady <sdb@zubnet.me.uk>
-Swift Griggs <swiftgriggs@gmail.com>
-tu83 <7u83@mail.ru>
-Ulrich Wilkens <mail@uwilkens.de>
-Ulrich Wilkens <wilkens@prokyon.(none)>
-WHR <msl0000023508@gmail.com>
-William Schaub <wschaub@genesi-tech.com>
-wmoxam <wes@wmoxam.com>
+Adam Robinson <adamrobinson at comcast.net>
+Adam Sampson <ats at offog.org>
+Alex Ivanov <gnidorah at ya.ru>
+alx <alx at fastestcode.org>
+Anthony Perkins <anthony at muzz.co.uk>
+chase <chase at localhost.com>
+Chase <nicetrynsa at protonmail.ch>
+Chris Wareham <chris at chriswareham.net>
+Cody Kotichas <ckotichas at csu.fullerton.edu>
+David Cantrell <david.l.cantrell at gmail.com>
+David Cantrell <dcantrell at redhat.com>
+David J.McBrayer <D9J0M.dev at gmail.com>
+Douglas Carmichael <dcarmich at dcarmichael.net>
+Douglas Mencken <dougmencken at gmail.com>
+Edmond Orignac <edmond.orignac at wanadoo.fr>
+Edmond ORIGNAC <Edmond.Orignac at wanadoo.fr>
+Eugene Doudine <dudinea at gmail.com>
+Frederic Koehler <f.koehler427 at gmail.com>
+Giacomo Comes <comes at naic.edu>
+ibid_ag at lavabit.com <ibid_ag at lavabit.com>
+Isaac Dunham <ibid.ag at gmail.com>
+James Woodcock <james_woodcock at yahoo.co.uk>
+Jelle Hermsen <jelle at jellehermsen.nl>
+Johannes von Rotz <jr at vrtz.ch>
+Jon Trulson <allura at localhost>
+Jon Trulson <jon at radscan.com>
+Jose Rubio <joserubiovidales at gmail.com>
+Karsten Pedersen <kpedersen at hotmail.co.uk>
+Lev Kujawski <int21h at mailbox.org>
+Liang Chang <l-chang at users.sourceforge.net>
+Marc Balmer <marc at msys.ch>
+Marcin Cieslak <saper at saper.info>
+Marcin Cieślak <saper at saper.info>
+Matthew Howkins <mhowkins at users.sourceforge.net>
+Matthew R. Trower <dev at blackshard.net>
+Michael McConville <mmcco at mykolab.com>
+Mike Stroyan <mike at stroyan.net>
+Nina Didenko <nina.didenko at gmail.com>
+OBATA Akio <obache at outlook.com>
+Pascal de Bruijn <pmjdebruijn at pcode.nl>
+Pascal Stumpf <Pascal.Stumpf at cubes.de>
+Peter Howkins <flibble at users.sf.net>
+Peter Howkins <flibble at users.sourceforge.net>
+Peter Howkins <peter at azmaria.(none)>
+Peter Howkins <peter at deb8>
+Peter Howkins <peter at debian.uk.nds.com>
+Peter Howkins <peter at vita2.home.marutan.net>
+Peter Howkins <peter at x-1204.(none)>
+Peter Howkins <peter at x1204.(none)>
+Peter Howkins <peter at xubuntu.uk.nds.com>
+Peter Tribble <peter.tribble at gmail.com>
+Robert Tomsick <robert at tomsick.net>
+Stuart Brady <sdb at zubnet.me.uk>
+Swift Griggs <swiftgriggs at gmail.com>
+tu83 <7u83 at mail.ru>
+Ulrich Wilkens <mail at uwilkens.de>
+Ulrich Wilkens <wilkens at prokyon.(none)>
+WHR <msl0000023508 at gmail.com>
+William Schaub <wschaub at genesi-tech.com>
+wmoxam <wes at wmoxam.com>