From 8825d51f6440b101f94b7d9201409e63c2a17af4 Mon Sep 17 00:00:00 2001
From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Mon, 30 May 2011 14:14:03 +0200
Subject: [PATCH] 6429: Sync history/about

Adding new developers (including myself :-)
Adding Rijksmuseum.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e4a9c29c948cb34e3524e2581421ffa7649c39f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
---
 docs/history.txt                              |  2 +-
 .../intranet-tmpl/prog/en/modules/about.tt    | 41 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index b2df084b98..f33f90cd10 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -296,7 +296,7 @@ April 3	2006	Developer meeting on IRC
 April 11 2006	 Tümer Garip becomes the 40th committer to Koha (major influence in the addition of zebra to Koha and other)
 April 14 2006	Pierrick Le Gall begins as translation manager
 May 2,3 2006	 Kohacon in Paris http://www.koha.org/community/conferences/
-May 12 2006	 Bruno Tuomi (from San Ouest Provence) becomes the 41st committer to Koha
+May 12 2006	 Bruno Toumi (from San Ouest Provence) becomes the 41st committer to Koha
 May 12-18 2006	 Developers week at Bibliotheque du Centre de Mathematiques et Informatique (CMI) at the Universite de Provence, in Marseille
 May 19 2006	 Arnaud Laurin (also from SAN-OP) becomes the 42nd committer to Koha
 May 31 2006	First email from Mike Hafen to the devel list
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 5ca2e68995..93f2144b54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -114,9 +114,12 @@
             <h2>Koha Development Team</h2>
 			<ul>
                 <li>Md. Aftabuddin</li>
+		<li>Edward Allen</li>
                 <li>Francisco M. Marzoa Alonso</li>
                 <li>Cindy Murdock Ames</li>
+                <li>Richard Anderson</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
+		<li>Tomás Cohen Arazi</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692124662">Andrew Arensburger (the small and great C4::Context module)</a></li>
                 <li>Alex Arnaud</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614259">Joe Atzberger</a></li>
@@ -132,40 +135,61 @@
                 <li>Roger Buck</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692376789">Jared Camins-Esakov</a></li>
                 <li>Colin Campbell</li>
+		<li>Fernando Canizo</li>
+		<li>Frédérick Capovilla</li>
                 <li>DeAndre Carroll</li>
                 <li>Chris Catalfo (new plugin MARC editor)</li>
                 <li>Marc Chantreux</li>
+		<li>Jerome Charaoui</li>
+                <li>Andrew Chilton</li>
                 <li>Garry Collum</li>
+		<li>John Copeland</li>
+		<li>Christophe Croullebois</li>
+                <li>Nate Curulla</li>
                 <li>Vincent Danjean</li>
+		<li>Doug Dearden</li>
                 <li>Kip DeGraaf</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></li>
+		<li>Jonathan Druart</li>
+		<li>Serhij Dubyk</li>
                 <li>Thomas Dukleth (MARC Frameworks Maintenance)</li>
+		<li>Frederic Durand</li>
                 <li>Sebastiaan Durand</li>
                 <li>Ecole des Mines de Saint Etienne, Philippe Jaillon (OAI-PMH support)</li>
                 <li>Stephen Edwards</li>
                 <li>Andrew Elwell</li>
+                <li>Brian Engard</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544677502">Magnus Enger</a></li>
                 <li>Esiee School (Jérome Vizcaino, Michel Lerenard, Pierre Cauchois)</li>
+		<li>Shaun Evans</li>
                 <li>Pat Eyler (Kaitiaki from 2002 to 2004)</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544609865">Antoine Farnault</a></li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544670742">Katrin Fischer</a></li>
                 <li>Clay Fouts</li>
+		<li>Claudia Forsman</li>
                 <li>Marco Gaiarin</li>
+                <li>Pierrick Le Gall</li>
                 <li>Brendan A. Gallagher</li>
                 <li>Tumer Garip</li>
                 <li>Russel Garlick</li>
+		<li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
+                <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
+		<li>Christopher Hall</li>
                 <li>Mike Hansen</li>
                 <li>Brian Harrington</li>
+                <li>Friedrich zur Hellen</li>
                 <li>Michaes Herman</li>
                 <li>Wolfgang Heymans</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544614261">Ryan Higgins</a></li>
                 <li>Sèbastien Hinderer</li>
+		<li>Stephanie Hogan</li>
                 <li>Daniel Holth</li>
                 <li>Andrew Hooper</li>
+                <li>Matthew Hunt</li>
                 <li>Christopher Hyde</li>
                 <li>Cory Jaeger</li>
                 <li>Srdjan Jankovic</li>
@@ -173,6 +197,7 @@
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692132429">Mason James</a></li>
                 <li>Mike Johnson</li>
                 <li>Donovan Jones</li>
+		<li>Janusz Kaczmarek</li>
                 <li>Koustubha Kale</li>
                 <li>Arnaud Laurin</li>
                 <li>Ambrose Li (translation tool)</li>
@@ -180,19 +205,31 @@
                 <li>Robert Lyon (Corporate Serials)</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
+		<li>Julian Maurice</li>
                 <li>Brig C. McCoy</li>
                 <li>Dorian Meid (German translation)</li>
                 <li>Matthias Meusburger</li>
+		<li>Sophie Meynieux</li>
+                <li>Alan Millar</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
                 <li>Sharon Moreland</li>
                 <li>Nicolas Morin</li>
  		<li>Mike Mylonas</li>
                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
+		<li>Eric Olsen</li>
+		<li>H. Passini</li>
+		<li>Dobrica Pavlinusic</li>
                 <li>Polytechnic University</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
                 <li>Liz Rea</li>
                 <li>Allen Reinmeyer</li>
+                <li>Serge Renaux</li>
+                <li>Waylon Robertson</li>
+                <li>Marcel de Rooy</li>
+		<li>Salvador Zaragoza Rubio</li>
+		<li>Brice Sanchez</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
+		<li>Zach Sim</li>
                 <li>Savitra Sirohi</li>
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Southeastern University</li>
@@ -209,6 +246,7 @@
                 <li>Andrei V. Toutoukine</li>
                 <li>Darrell Ulm</li>
                 <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</li>
+		<li>Reed Wade</li>
 		<li>Ian Walls</li>
                 <li><a href="http://www.ohloh.net/accounts/janewagner">Jane Wagner</a></li>
                 <li><a href="https://www.ohloh.net/accounts/pianohacker">Jesse Weaver</a></li>
@@ -219,7 +257,7 @@
                 <li>James Winter</li>
                 <li>Lars Wirzenius</li>
 			</ul>
-            <h3>Contributing Companies</h3>
+            <h3>Contributing Companies and Institutions</h3>
             <ul>
                 <li><strong>BibLibre</strong>, France</li>
                 <li><strong>Bibliotheksservice-Zentrum Baden-Württemberg (BSZ)</strong>, Germany</li>
@@ -232,6 +270,7 @@
 		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
 		<li><strong>PTFS</strong>, Maryland, USA</li>
 		<li><strong>PTFS Europe Ltd</strong>, United Kingdom</li>
+		<li><strong>Rijksmuseum</strong>, Amsterdam, The Netherlands</li>
 		<li><strong>SAN-Ouest Provence</strong>, France</li>
 		<li><strong>Software Coop</strong>, United Kingdom</li>
 		<li><strong>Tamil</strong>, France</li>
-- 
2.39.5