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

* AUTHORS: Add Arne Babenhauserheide, Ian Denhardt, Alex Kost, Kevin
  Lemonnier, Mathieu Lirzin, Pierre-Antoine Rault and Ben Woodcroft.
  Align Paul van der Walt name properly.
* THANKS: Add Konrad Hinsen, Cyprien Nicolas, Yakkala Yagnesh Raghava
  and Alexander Shendi.
  Remove Federico Beffa, Marek Benc, John Darrington, Alex Kost,
  rekado, Cyrill Schenkel and Andy Wingo because they are placed in
  AUTHORS.
  Align Kete name properly.
---
 AUTHORS |  9 ++++++++-
 THANKS  | 13 +++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 6eadb7f..67b81fa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,7 @@ 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>
        Federico Beffa <beffa@fbengineering.ch>
@@ -16,6 +17,7 @@ alphabetical order):
           Tomáš Čech <sleep_walker@suse.cz>
         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,10 +25,14 @@ 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>
@@ -34,8 +40,9 @@ alphabetical order):
     Sree Harsha Totakura <sreeharsha@totakura.in>
           David Thompson <dthompson2@worcester.edu>
           Claes Wallin (韋嘉誠) <claes.wallin@greatsinodevelopment.com>
-           Paul van der Walt <paul@denknerd.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>
+            Ben Woodcroft <donttrustben@gmail.com>
         Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
diff --git a/THANKS b/THANKS
index 8093d8c..dcb3a39 100644
--- a/THANKS
+++ b/THANKS
@@ -7,8 +7,6 @@ suggestions, bug reports, patches, internationalization, or general
 infrastructure help:
 
 	    Lluís Batlle i Rossell <viric@viric.name>
-         Federico Beffa <beffa@ieee.org>
-            Marek Benc <merkur32@gmail.com>
           Sylvain Beucler <beuc@beuc.net>
         Amirouche Boubekki <amirouche.boubekki@gmail.com>
 	   Carlos Carleos <carleos@uniovi.es>
@@ -16,29 +14,28 @@ infrastructure help:
 	   Daniel Clark <dclark@pobox.com>
 	Alexandru Cojocaru <xojoc@gmx.com>
 	    Aleix Conchillo Flaqué <aconchillo@gmail.com>
-	     John Darrington <jmd@gnu.org>
 	   Rafael Ferreira <rafael.f.f1@gmail.com>
 	Christian Grothoff <christian@grothoff.org>
+           Konrad Hinsen <konrad.hinsen@fastmail.net>
           Brandon Invergo <brandon@gnu.org>
 	  Jeffrin Jose <ahiliation@yahoo.co.in>
-	     Kete <kete@ninthfloor.org>
+	          Kete <kete@ninthfloor.org>
            Daniel Kochmański <dkochmanski@hellsgate.pl>
-             Alex Kost <alezost@gmail.com>
 	  Matthew Lien <bluet@bluet.org>
 	    Niels Möller <nisse@lysator.liu.se>
+          Cyprien Nicolas <cyprien@nicolas.tf>
 	   Yutaka Niibe <gniibe@fsij.org>
            Andrei Osipov <andrspv@gmail.com>
              Adam Pribyl <pribyl@lowlevel.cz>
             Pjotr Prins <pjotr.public12@thebird.nl>
-                  rekado <rekado@elephly.net>
+  Yakkala Yagnesh Raghava <hi@yagnesh.org>
            Joshua Randall <jcrandall@alum.mit.edu>
       Bruno Félix Rezende Ribeiro <oitofelix@gnu.org>
-	   Cyrill Schenkel <cyrill.schenkel@gmail.com>
 	    Benno Schulenberg <coordinator@translationproject.org>
            Thomas Schwinge <thomas@codesourcery.com>
+        Alexander Shendi <Alexander.Shendi@web.de>
 	     Alen Skondro <askondro@gmail.com>
 	 Matthias Wachs <wachs@net.in.tum.de>
-             Andy Wingo <wingo@pobox.com>
            Philip Woods <elzairthesorcerer@gmail.com>
 
 GNU Guix also includes non-software works.  Thanks to the following
-- 
2.4.3