From e7c48ee9519aa5cd094f3326a4caeccba072e9fd Mon Sep 17 00:00:00 2001
From: Alex Kost <alezost@gmail.com>
Date: Sat, 27 Jun 2015 20:42:32 +0300
Subject: Clean up 'THANKS' and 'AUTHORS'.

* THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
  and Alexander Shendi.  Remove Federico Beffa, Marek Benc, John
  Darrington, rekado, Cyrill Schenkel and Andy Wingo because they are
  placed in AUTHORS.  Move Amirouche Boubekki and Alex Kost to ...
* AUTHORS: ... here.  Add Arne Babenhauserheide, Ian Denhardt, Kevin
  Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
  Fix some names and emails.
---
 AUTHORS | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
index 6eadb7f5ba..24dbcd1aa3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-GNU Guix is consists of Scheme code that implements the deployment model
+GNU Guix consists of Scheme code that implements the deployment model
 of the Nix package management tool.  In fact, it currently talks to a
 build daemon whose code comes from Nix (see the manual for details.)
 
@@ -8,14 +8,17 @@ contributing to it.  See `nix/AUTHORS' for details.
 The fine people listed below have contributed code to GNU Guix (in
 alphabetical order):
 
+           Arne Babenhauserheide <arne.babenhauserheide@kit.edu>
            Eric Bavier <bavier@member.fsf.org>
-  Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com>
+  Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
        Federico Beffa <beffa@fbengineering.ch>
           Marek Benc <merkur32@gmail.com>
+      Amirouche Boubekki <amirouche@hypermove.net>
             Sou Bunnbu (宋文武) <iyzsong@gmail.com>
-          Tomáš Čech <sleep_walker@suse.cz>
+          Tomáš Čech <sleep_walker@gnu.org>
         Ludovic Courtès <ludo@gnu.org>
            John Darrington <jmd@gnu.org>
+            Ian Denhardt <ian@zenhack.net>
         Andreas Enge <andreas@enge.fr>
          Alírio Eyng <alirioeyng@gmail.com>
    Alexander I. Grafov <grafov@gmail.com>
@@ -23,19 +26,24 @@ alphabetical order):
          Raimon Grau <raimonster@gmail.com>
           David Hashe <david.hashe@dhashe.com>
          Nikita Karetnikov <nikita@karetnikov.org>
+           Alex Kost <alezost@gmail.com>
+          Kevin Lemonnier <lemonnierk@ulrar.net>
          Julien Lepiller <julien@lepiller.eu>
+        Mathieu Lirzin <mthl@openmailbox.org>
         Aljosha Papsch <misc@rpapsch.de>
            Deck Pickard <deck.r.pickard@gmail.com>
         Manolis Ragkousis <manolis837@gmail.com>
+ Pierre-Antoine Rault <par@rigelk.eu>
           Cyril Roelandt <tipecaml@gmail.com>
            Alex Sassmannshausen <alex.sassmannshausen@gmail.com>
          Cyrill Schenkel <cyrill.schenkel@gmail.com>
           Jason Self <j@jxself.org>
     Sree Harsha Totakura <sreeharsha@totakura.in>
-          David Thompson <dthompson2@worcester.edu>
+          David Thompson <davet@gnu.org>
           Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
-           Paul van der Walt <paul@denknerd.org>
-        Mark H. Weaver <mhw@netris.org>
+   Paul van der Walt <paul@denknerd.org>
+         Mark H Weaver <mhw@netris.org>
  Christopher A. Webber <cwebber@dustycloud.org>
            Andy Wingo <wingo@pobox.com>
-        Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
+            Ben Woodcroft <b.woodcroft@uq.edu.au>
+        Ricardo Wurmus <rekado@elephly.net>
-- 
cgit v1.2.3