From 0fbe2bba60bab5db12f7213e05ee6365b17f86c7 Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Tue, 22 Mar 2022 17:50:33 +0100
Subject: [PATCH] Separate ex-maintener from logilaber and googler

---
 CONTRIBUTORS.txt                  | 13 +++++++++----
 script/.contributors_aliases.json | 15 +++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index 7e83c18e99..49a7749854 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -4,10 +4,15 @@
 # using '-' as the line first character.
 # Please verify that your change are stable if you modify manually.
 
-Maintainers
------------
+Ex-maintainers
+--------------
 - Claudiu Popa <pcmanticore@gmail.com>
 - Sylvain Thénault <thenault@gmail.com>
+- Torsten Marek <shlomme@gmail.com>
+
+
+Maintainers
+-----------
 - Pierre Sassoulas <pierre.sassoulas@gmail.com>
 - Hippo91 <guillaume.peillex@gmail.com>
 - Marc Mueller <30130371+cdce8p@users.noreply.github.com>
@@ -25,7 +30,6 @@ Maintainers
 Contributors
 ------------
 - LOGILAB S.A. (Paris, FRANCE) <contact@logilab.fr>
-- Google, Inc. <no-reply@google.com>
 - Nick Drozd <nicholasdrozd@gmail.com>
 - Andrew Haigh <hello@nelf.in>
 - David Liu <david@cs.toronto.edu>
@@ -70,6 +74,7 @@ Contributors
 - Joshua Cannon <joshdcannon@gmail.com>
 - John Vandenberg <jayvdb@gmail.com>
 - Jacob Bogdanov <jacob@bogdanov.dev>
+- Google, Inc. <no-reply@google.com>
 - David Euresti <github@euresti.com>
 - David Cain <davidjosephcain@gmail.com>
 - Anthony Sottile <asottile@umich.edu>
@@ -80,7 +85,6 @@ Contributors
 - raylu <lurayl@gmail.com>
 - mathieui <mathieui@users.noreply.github.com>
 - markmcclain <markmcclain@users.noreply.github.com>
-- kasium <15907922+kasium@users.noreply.github.com>
 - ioanatia <ioanatia@users.noreply.github.com>
 - grayjk <grayjk@gmail.com>
 - Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
@@ -112,6 +116,7 @@ Contributors
 - Leandro T. C. Melo <ltcmelo@gmail.com>
 - Konrad Weihmann <kweihmann@outlook.com>
 - Kian Meng, Ang <kianmeng.ang@gmail.com>
+- Kai Mueller <15907922+kasium@users.noreply.github.com>
 - Jörg Thalheim <Mic92@users.noreply.github.com>
 - Jonathan Striebel <jstriebel@users.noreply.github.com>
 - John Belmonte <john@neggie.net>
diff --git a/script/.contributors_aliases.json b/script/.contributors_aliases.json
index 5dc7241d02..964d472f3b 100644
--- a/script/.contributors_aliases.json
+++ b/script/.contributors_aliases.json
@@ -4,6 +4,10 @@
     "name": "Daniël van Noord",
     "team": "Maintainers"
   },
+  "15907922+kasium@users.noreply.github.com": {
+    "mails": ["15907922+kasium@users.noreply.github.com"],
+    "name": "Kai Mueller"
+  },
   "30130371+cdce8p@users.noreply.github.com": {
     "mails": ["30130371+cdce8p@users.noreply.github.com"],
     "name": "Marc Mueller",
@@ -116,8 +120,6 @@
     "mails": [
       "nathaniel@google.com",
       "mbp@google.com",
-      "tmarek@google.com",
-      "shlomme@gmail.com",
       "balparda@google.com",
       "dlindquist@google.com"
     ],
@@ -126,7 +128,7 @@
   "pcmanticore@gmail.com": {
     "mails": ["cpopa@cloudbasesolutions.com", "pcmanticore@gmail.com"],
     "name": "Claudiu Popa",
-    "team": "Maintainers"
+    "team": "Ex-maintainers"
   },
   "pierre.sassoulas@gmail.com": {
     "mails": ["pierre.sassoulas@gmail.com", "pierre.sassoulas@cea.fr"],
@@ -142,6 +144,11 @@
     "name": "Łukasz Rogalski",
     "team": "Maintainers"
   },
+  "shlomme@gmail.com": {
+    "mails": ["shlomme@gmail.com", "tmarek@google.com"],
+    "name": "Torsten Marek",
+    "team": "Ex-maintainers"
+  },
   "stefan@sofa-rockers.org": {
     "mails": ["stefan.scherfke@energymeteo.de", "stefan@sofa-rockers.org"],
     "name": "Stefan Scherfke"
@@ -149,7 +156,7 @@
   "thenault@gmail.com": {
     "mails": ["thenault@gmail.com", "sylvain.thenault@logilab.fr"],
     "name": "Sylvain Thénault",
-    "team": "Maintainers"
+    "team": "Ex-maintainers"
   },
   "ville.skytta@iki.fi": {
     "mails": ["ville.skytta@iki.fi", "ville.skytta@upcloud.com"],