From 7d7bac40c13ebeef442d30812f29905f50f966d5 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Mon, 25 May 2015 12:18:02 +0200
Subject: [PATCH] Bug 7143: Release team for 3.22

See: http://wiki.koha-community.org/wiki/Roles_for_3.22
The 3.20 roles are moved to the Development section. Note that we did
not add the Bug wranglers role under Development until now. If that
should change, please provide a follow-up.

Test plan:
Verify that all roles are covered correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Seems correct for me, no errors.

Signed-off-by: Jonathan Druart <jonathan.druart@koha-community.org>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
---
 .../intranet-tmpl/prog/en/modules/about.tt    | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 689861d1aa..fd12bd0ffd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -254,7 +254,7 @@
                 <li><a href="http://www.ashs.school.nz/">Albany Senior High School</a>, Auckland, New Zealand (OPAC 'star-ratings' sponsorship)</li>
             </ul>
 
-            <h2>Koha 3.20 release team</h2>
+            <h2>Koha 3.22 release team</h2>
             <ul>
                 <li><strong>Release manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi</a></li>
@@ -266,7 +266,6 @@
                     <a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel</a></li>
                 <li><strong>Quality assurance team:</strong>
                     <ul>
-                        <li>Christopher Brannon</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan Gallagher</a></li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall</a></li>
@@ -277,7 +276,8 @@
                 </li>
                 <li><strong>Release maintainers:</strong>
                     <ul>
-                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (3.18)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack</a> (3.20)</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544650708">Liz Rea</a> (3.18)</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6618544618401">Mason James</a> (3.16)</li>
                         <li><a href="https://www.openhub.net/p/koha/contributors/6620692831733">Fridolin Somers</a> (3.14)</li>
                     </ul>
@@ -285,8 +285,15 @@
                 <li><strong>Packaging manager:</strong>
                     <a href="https://www.openhub.net/p/koha/contributors/6618544619438">Robin Sheat</a>
                 </li>
-                <li><strong>Bug wrangler:</strong>
-                    <a href="https://www.openhub.net/p/koha/contributors/6618544677502">Magnus Enger</a>
+                <li><strong>Bug wranglers:</strong>
+                    <ul>
+                        <li>Indranil Das Gupta</li>
+                        <li><a href="https://www.openhub.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
+                        <li>Amit Gupta</li>
+                        <li>Eivin Giske Skaaren</li>
+                        <li>Zeno Tajoli</li>
+                        <li>Mirko Tietgen</li>
+                    </ul>
                 </li>
             </ul>
 
@@ -304,7 +311,7 @@
                 <li>Richard Anderson</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 Release Manager; 3.12 Release Maintainer)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544730094">Tomás Cohen Arazi (3.18 and 3.20 Release Manager; 3.12 Release Maintainer)</a></li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
                 <li>Alex Arnaud</li>
                 <li>Petter Goksoyr Asen</li>
@@ -328,6 +335,7 @@
                 <li>Florian Bischof</li>
                 <li>Gaetan Boisson</li>
                 <li>Danny Bouman</li>
+                <li>Christopher Brannon (3.20 QA Team Member)</li>
                 <li>Stan Brinkerhoff</li>
                 <li>Isaac Brodsky</li>
                 <li>Ivan Brown</li>
@@ -350,7 +358,7 @@
                 <li>Garry Collum</li>
                 <li>David Cook</li>
                 <li>John Copeland</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4, and 3.6 Release Manager; 3.8 and 3.10 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544609030">Chris Cormack (1.x, 3.4, and 3.6 Release Manager; 3.8, 3.10 and 3.18 Release Maintainer; 3.2 Translation Manager; 3.14 QA Team Member)</a></li>
                 <li>Jeremy Crabtree</li>
                 <li>Samuel Crosby</li>
                 <li>Christophe Croullebois</li>
@@ -365,7 +373,7 @@
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692210484">Frédéric Demians (3.4 - 3.10 Translation Manager)</a></li>
                 <li>Connor Dewar</li>
                 <li>Srikanth Dhondi</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618545125093">Jonathan Druart (3.8 - 3.20 QA Team Member)</a></li>
                 <li>Serhij Dubyk</li>
                 <li>Yohann Dufour</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
@@ -387,7 +395,7 @@
                 <li>Vitor Fernandes</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6618544609053">Joshua Ferraro (3.0 Release Manager and Translation Manager)</a></li>
                 <li>Julian Fiol</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 3.18 QA Manager)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544670742">Katrin Fischer (3.12 - 3.20 QA Manager)</a></li>
                 <li>Connor Fraser</li>
                 <li>Clay Fouts</li>
                 <li>Brendon Ford</li>
@@ -395,18 +403,18 @@
                 <li>Corey Fuimaono</li>
                 <li>Marco Gaiarin</li>
                 <li>Pierrick Le Gall</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. Gallagher (3.14 - 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544661344">Brendan A. Gallagher (3.14 - 3.20 QA Team Member)</a></li>
                 <li>Tumer Garip</li>
                 <li>Russel Garlick</li>
                 <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.14 - 3.18 Translation Manager; 3.10 Release Maintainer)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544839606">Bernardo González Kriegel (3.14 - 3.20 Translation Manager; 3.10 Release Maintainer)</a></li>
                 <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
                 <li>Christopher Hall (3.8 Release Maintainer)</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6620692261494">Kyle Hall (3.8 Release Maintainer; 3.14 - 3.20 QA Team Member)</a></li>
                 <li>Sean Hamlin</li>
                 <li>Tim Hannah</li>
                 <li>Mike Hansen</li>
@@ -434,7 +442,7 @@
                 <li>Cory Jaeger</li>
                 <li>Srdjan Jankovic</li>
                 <li>Philippe Jaillon</li>
-                <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James (3.10 - 3.14 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/accounts/kohaaloha">Mason James (3.10 - 3.14 QA Team Member, 3.16 Release Maintainer)</a></li>
                 <li>Mike Johnson</li>
                 <li>Donovan Jones</li>
                 <li>Bart Jorgensen</li>
@@ -491,18 +499,18 @@
                 <li>Shari Perkins</li>
                 <li>Fred Pierre</li>
                 <li>Polytechnic University</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544612249">Paul Poulain (2.0, 2.2, 3.8, 3.10 Release Manager; 2.2 Release Maintainer; 3.12 - 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544612249">Paul Poulain (2.0, 2.2, 3.8, 3.10 Release Manager; 2.2 Release Maintainer; 3.12 - 3.20 QA Team Member)</a></li>
                 <li>Karam Qubsi</li>
                 <li>Romina Racca</li>
                 <li><a href="https://www.openhub.net/p/koha/contributors/6620692116417">MJ Ray (2.0 Release Maintainer)</a></li>
-                <li>Liz Rea (3.6 Release Maintainer)</li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544650708">Liz Rea</a> (3.6 Release Maintainer)</li>
                 <li>Thatcher Rea</li>
                 <li>Allen Reinmeyer</li>
                 <li>Serge Renaux</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize (3.16, 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544785220">Martin Renvoize (3.16 - 3.20 QA Team Member)</a></li>
                 <li>Abby Robertson</li>
                 <li>Waylon Robertson</li>
-                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 3.18 QA Team Member)</a></li>
+                <li><a href="https://www.openhub.net/p/koha/contributors/6618544727712">Marcel de Rooy (3.8 - 3.20 QA Team Member)</a></li>
                 <li>Salvador Zaragoza Rubio</li>
                 <li>Mathieu Saby</li>
                 <li>Brice Sanchez</li>
-- 
2.39.5