summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS6
2 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index ef992110..4daed49f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -2,3 +2,4 @@
<cfergeau@redhat.com> <cfergeau@gmail.com>
<yhalperi@redhat.com> <yhalperi@yhalperi.tlv.redhat.com>
<alexl@redhat.com> <Larsson@.(none)>
+<nshalman@elys.com> <nshalman-github@elys.com>
diff --git a/AUTHORS b/AUTHORS
index 6fe2e88e..230387e3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -18,13 +18,19 @@ Previous Spice maintainers were
Patches also contributed by
Alexander Larsson <alexl@redhat.com>
+ Aric Stewart <aric@codeweavers.com>
Arnon Gilboa <agilboa@redhat.com>
Daniel P. Berrange <berrange@redhat.com>
Dan Kenigsberg <danken@redhat.com>
+ Dan McGee <dpmcgee@gmail.com>
+ Erlon Cruz <erlon.cruz@br.flextronics.com>
+ Fabiano Fidêncio <fabiano@fidencio.org>
Gal Hammer <ghammer@redhat.com>
Hans de Goede <hdegoede@redhat.com>
Jürg Billeter <j@bitron.ch>
Liang Guo <bluestonechina@gmail.com>
+ Michael Tokarev <mjt@tls.msk.ru>
+ Nahum Shalman <nshalman@elys.com>
Søren Sandmann Pedersen <ssp@redhat.com>
Thomas Tyminski <thomast@cs.tu-berlin.de>
Tiziano Mueller <dev-zero@gentoo.org>