From 8e12b6c3034551bf191b4ca4dc925bb65a716815 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri, 28 Dec 2012 09:51:46 +1300
Subject: [PATCH] Bug 7143 updating history and about page

Signed-off-by: Liz Rea <liz@catalyst.net.nz>
Changes look to be correct

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
---
 docs/history.txt                                 |  166 +++++++++++-----------
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt |    5 +-
 2 files changed, 87 insertions(+), 84 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index d1d94c2..c07d334 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -503,147 +503,149 @@ August 31 2010	Stéphane Delaune becomes the 116th committer to have a patch acc
 September 1 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_1_September_2010
 September 29 2010	Eric Olsen becomes the 117th committer to have a patch accepted
 October 6 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_6_October_2010
+October 17 2012	Bernardo Gonzalez Kriegel becomes the 118th developer to have a patch pushed
 October 22 2010	Koha 3.2.0 released
 October 25-31 2010	Kohacon10 in Wellington
-October 30 2010	Brian Engard becomes the 118th committer to have a patch accepted
-October 30 2010	 Daniel Grobani becomes the 119th committer to have a patch accepted
-October 31 2010	Nate Curulla becomes the 120th committer to have a patch accepted
+October 30 2010	Brian Engard becomes the 119th committer to have a patch accepted
+October 30 2010	 Daniel Grobani becomes the 120th committer to have a patch accepted
+October 31 2010	Nate Curulla becomes the 121st committer to have a patch accepted
 November 10 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_10_November_2010
-November 17 2010	Tomás Cohen Arazi becomes the 121th committer to have a patch accepted
+November 17 2010	Tomás Cohen Arazi becomes the 122nd committer to have a patch accepted
 November 20 2010	Koha 3.2.1 released
 December 8 2010	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_8_December_2010
-December 15 2010	Serhij Dubyk becomes the 122st developer to have a patch pushed
-December 16 2010	Christophe Croullebois becomes the 123nd developer to have a patch pushed
-December 19 2010	Edward Allen becomes the 124rd developer to have a patch pushed
-December 20 2010	Dobrica Pavlinusic becomes the 125th developer to have a patch pushed
+December 15 2010	Serhij Dubyk becomes the 123rd developer to have a patch pushed
+December 16 2010	Christophe Croullebois becomes the 124th developer to have a patch pushed
+December 19 2010	Edward Allen becomes the 125th developer to have a patch pushed
+December 20 2010	Dobrica Pavlinusic becomes the 126th developer to have a patch pushed
 December 22 2010	Koha 3.2.2 released
 January 5 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_5_January_2011
-January 12 2011	Brice Sanchez becomes the 126th developer to have a patch pushed
-January 17 2011	Zach Sim becomes the 127th developer to have a patch pushed
-January 17 2011	Claudia Forsman becomes the 128th developer to have a patch pushed
-January 17 2011	John Copeland becomes the 129th developer to have a patch pushed
-January 17 2011	Stephanie Hogan becomes the 130th developer to have a patch pushed
+January 12 2011	Brice Sanchez becomes the 127th developer to have a patch pushed
+January 17 2011	Zach Sim becomes the 128th developer to have a patch pushed
+January 17 2011	Claudia Forsman becomes the 129th developer to have a patch pushed
+January 17 2011	John Copeland becomes the 130th developer to have a patch pushed
+January 17 2011	Stephanie Hogan becomes the 131st developer to have a patch pushed
 January 22 2011	Koha 3.2.3 released
-January 26 2011	Jerome Charaoui becomes the 131th developer to have a patch pushed
-January 31 2011	Reed Wade becomes the 132sth developer to have a patch pushed
+January 26 2011	Jerome Charaoui becomes the 132nd developer to have a patch pushed
+January 31 2011	Reed Wade becomes the 133rd developer to have a patch pushed
 February 1 2011	#koha moves from irc.katipo.co.nz to irc.oftc.net
 February 2 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_February_2011
-February 3 2011	Frédérick Capovilla becomes the 133nd developer to have a patch pushed
-February 4 2011	Christopher Hall becomes the 134rd developer to have a patch pushed
+February 3 2011	Frédérick Capovilla becomes the 134th developer to have a patch pushed
+February 4 2011	Christopher Hall becomes the 135th developer to have a patch pushed
 February 22 2011	Koha 3.2.4 released
 February 24 2011	Koha 3.2.5 released
 March 2 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_March_2011
-March 13 2011	Janusz Kaczmarek becomes the 135th developer to have a patch pushed
-March 13 2011	Salvador Zaragoza Rubio becomes the 136th developer to have a patch pushed
-March 17 2011	Julian Maurice becomes the 137th developer to have a patch pushed
-March 17 2011	Sophie Meynieux becomes the 138th developer to have a patch pushed
+March 13 2011	Janusz Kaczmarek becomes the 136th developer to have a patch pushed
+March 13 2011	Salvador Zaragoza Rubio becomes the 137th developer to have a patch pushed
+March 17 2011	Julian Maurice becomes the 138th developer to have a patch pushed
+March 17 2011	Sophie Meynieux becomes the 139th developer to have a patch pushed
 March 22 2011	Koha 3.2.6 released
-March 31 2011	Doug Dearden becomes the 139th developer to have a patch pushed
+March 31 2011	Doug Dearden becomes the 140th developer to have a patch pushed
 April 6 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_6_April_2011
-April 8 2011	Mark Gavillet becomes the  140th developer to have a patch pushed
-April 9 2011	Frederic Durand becomes the 141th developer to have a patch pushed
-April 9 2011	Jonathan Druart becomes the 142st developer to have a patch pushed
+April 8 2011	Mark Gavillet becomes the  141st developer to have a patch pushed
+April 9 2011	Frederic Durand becomes the 142nd developer to have a patch pushed
+April 9 2011	Jonathan Druart becomes the 143rd developer to have a patch pushed
 April 16 2011	Koha 3.2.7 released	releases
-April 20 2011	Fernando Canizo becomes the 143nd developer to have a patch pushed
+April 20 2011	Fernando Canizo becomes the 144th developer to have a patch pushed
 April 22 2011	Koha 3.4.0 released	releases
 May 11 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_11_May_2011
 May 15 2011	Koha 3.2.8 released	releases
 May 15 2011	Koha 3.2.9 released	releases
 May 22 2011	Koha 3.4.1 released	releases
-June 1 2011	Fridolyn Somers becomes the 144rd developer to have a patch pushed
-June 3 2011	Elliott Davis becomes the 145th developer to have a patch pushed
+June 1 2011	Fridolyn Somers becomes the 145th developer to have a patch pushed
+June 3 2011	Elliott Davis becomes the 146th developer to have a patch pushed
 June 14 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_14_June_2011
 June 15 2011	First ever global sign off day
-June 17 2011	Jeremy Crabtree becomes the 146th developer to have a patch pushed
+June 17 2011	Jeremy Crabtree becomes the 147th developer to have a patch pushed
 June 19 2011	Koha 3.2.10 released	releases
 June 28 2011	Koha 3.4.2 released	releases
 June 28 2011	Spanish speaking community meeting http://wiki.koha-community.org/wiki/Spanish_speaking_community_creation_IRC_Meeting,_28_June_2011
 June 29 2011	Kohacon11 volunteers meeting http://wiki.koha-community.org/wiki/KohaCon11_Volunteers#Next_Meeting_:_Wednesday_June_29_6.00_UTC
-July 5 2011	Francois Marier becomes the 147th developer to have a patch pushed
+July 5 2011	Francois Marier becomes the 148th developer to have a patch pushed
 July 6 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_6_July_2011
 July 25 2011	Koha 3.4.3 released	releases
-July 28 2011	John Seymour becomes the 148th developer to have a patch pushed
+July 28 2011	John Seymour becomes the 149th developer to have a patch pushed
 August 2 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_August_2011
 August 3 2011	Spanish speaking community meeting http://wiki.koha-community.org/wiki/Spanish_speaking_community_Mail_List_IRC_Meeting,_3_August_2011
-August 11 2011	Juan Romay Sieira becomes the 149th developer to have a patch pushed
-August 11 2011	Nuño López Ansótegui becomes the 150th developer to have a patch pushed
+August 11 2011	Juan Romay Sieira becomes the 150th developer to have a patch pushed
+August 11 2011	Nuño López Ansótegui becomes the 151sy developer to have a patch pushed
 August 22 2011	Koha 3.4.4 released	releases
-August 26 2011	Ward van Wanrooij becomes the 151th developer to have a patch pushed
-August 27 2011	Ulrich Kleiber becomes the 152st developer to have a patch pushed
-September 1 2011	Maxime Pelletier becomes the 153nd developer to have a patch pushed
-September 2 2011	Steven Callender becomes the 154rd developer to have a patch pushed
-September 6 2011	Brett Wilkins becomes the 155th developer to have a patch pushed
-September 11 2011	Meenakshi.R becomes the 156th developer to have a patch pushed
-September 23 2011	Joy Nelson becomes the 157th developer to have a patch pushed
-September 24 2011	Larry Baerveldt becomes the 158th developer to have a patch pushed
+August 26 2011	Ward van Wanrooij becomes the 152nd developer to have a patch pushed
+August 27 2011	Ulrich Kleiber becomes the 153rd developer to have a patch pushed
+September 1 2011	Maxime Pelletier becomes the 154th developer to have a patch pushed
+September 2 2011	Steven Callender becomes the 155th developer to have a patch pushed
+September 6 2011	Brett Wilkins becomes the 156th developer to have a patch pushed
+September 11 2011	Meenakshi.R becomes the 157th developer to have a patch pushed
+September 23 2011	Joy Nelson becomes the 158th developer to have a patch pushed
+September 24 2011	Larry Baerveldt becomes the 159th developer to have a patch pushed
 September 27 2011	Koha 3.4.5 released	releases
-September 28 2011	Thatcher Rea becomes the 159th developer to have a patch pushed
+September 28 2011	Thatcher Rea becomes the 160th developer to have a patch pushed
 October 5 2011	General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_5_October_2011
-October 15 2011	Greg Barniskis becomes the 160th developer to have a patch pushed
+October 15 2011	Greg Barniskis becomes the 161st developer to have a patch pushed
 October 22 2011	Koha 3.6.0 released	releases
 October 31 2011	4th KohaCon in Mumbaï, India
 November 9 2011	Koha 3.4.6 released	releases
 November 21 2011	Plea for help from Horowhenua Library Trust (Koha TM in NZ)
 November 29 2011	Koha 3.6.1 released	releases
 December 4 2011	Koha 3.2.11 released	releases
-December 6 2011	Martin Renvoize becomes the 161st developer to have a patch pushed
-December 6 2011	Adrien Saurat becomes the 162nd developer to have a patch pushed
-December 6 2011	Albert Oller becomes the 163rd developer to have a patch pushed
-December 7 2011	Jon Aker becomes the 164th developer to have a patch pushed
+December 6 2011	Martin Renvoize becomes the 162nd developer to have a patch pushed
+December 6 2011	Adrien Saurat becomes the 163rd developer to have a patch pushed
+December 6 2011	Albert Oller becomes the 164th developer to have a patch pushed
+December 7 2011	Jon Aker becomes the 165th developer to have a patch pushed
 December 7 2011	Koha 3.4.7 released	releases
-December 13 2011	Fabio Tiana becomes the 165th developer to have a patch pushed
-December 15 2011	Duncan Tyler becomes the 166th developer to have a patch pushed
-December 15 2011	Marc Balmer becomes the 167th developer to have a patch pushed
+December 13 2011	Fabio Tiana becomes the 166th developer to have a patch pushed
+December 15 2011	Duncan Tyler becomes the 167th developer to have a patch pushed
+December 15 2011	Marc Balmer becomes the 168th developer to have a patch pushed
 December 22 2011	Koha 3.6.2 released	releases
-January 16 2012	Jesse Maseto becomes the 168th developer to have a patch pushed
-January 17 2012	Connor Dewar becomes the 169th developer to have a patch pushed (as part of the Catalyst Open Source Academy)
-January 17 2012	Sam Sanders becomes the 170th developer to have a patch pushed (as part of the Catalyst Open Source Academy)
-January 18 2012	Olivier Crouzet becomes the 171st developer to have a patch pushed
+January 16 2012	Jesse Maseto becomes the 169th developer to have a patch pushed
+January 17 2012	Connor Dewar becomes the 170th developer to have a patch pushed (as part of the Catalyst Open Source Academy)
+January 17 2012	Sam Sanders becomes the 171st developer to have a patch pushed (as part of the Catalyst Open Source Academy)
+January 18 2012	Olivier Crouzet becomes the 172nd developer to have a patch pushed
 January 27 2012	Koha 3.6.3 released	releases
 January 27 2012	Koha 3.4.8 released	releases
-January 31 2012	Bart Jorgensen becomes the 172nd developer to have a patch pushed
-January 31 2012	Kate Henderson becomes the 173rd developer to have a patch pushed
-January 31 2012	Jono Mingard becomes the 174th developer to have a patch pushed
-January 31 2012	Jorgia Kelsey becomes the 175th developer to have a patch pushed
-February 1 2012	Aleksa Vujicic becomes the 176th developer to have a patch pushed
-February 1 2012	Peter Lorimer becomes the 177th developer to have a patch pushed
+January 31 2012	Bart Jorgensen becomes the 173rd developer to have a patch pushed
+January 31 2012	Kate Henderson becomes the 174th developer to have a patch pushed
+January 31 2012	Jono Mingard becomes the 175th developer to have a patch pushed
+January 31 2012	Jorgia Kelsey becomes the 176th developer to have a patch pushed
+February 1 2012	Aleksa Vujicic becomes the 177th developer to have a patch pushed
+February 1 2012	Peter Lorimer becomes the 178th developer to have a patch pushed
 March 4 2012	Koha 3.6.4 released	releases
-March 16 2012	David Cook becomes the 178th developer to have a patch pushed
-March 20 2012	Gaetan Boisson becomes the 179th developer to have a patch pushed
-April 15 2012	Marc Veron becomes the 180th developer to have a patch pushed
+March 16 2012	David Cook becomes the 179th developer to have a patch pushed
+March 20 2012	Gaetan Boisson becomes the 180th developer to have a patch pushed
+April 15 2012	Marc Veron becomes the 181st developer to have a patch pushed
 April 22 2012	Koha 3.8.0 released	releases
-May 11 2012	Lyon 3 team becomes the 181st developer to have a patch pushed
+May 11 2012	Lyon 3 team becomes the 182nd developer to have a patch pushed
 May 22 2012	Koha 3.8.1 released	releases
 May 25 2012	Koha 3.6.5 released	releases
-May 28 2012	Simon Story becomes the 182nd developer to have a patch pushed
-May 28 2012	Piotr Kowalski becomes the 183th developer to have a patch pushed
+May 28 2012	Simon Story becomes the 183rd developer to have a patch pushed
+May 28 2012	Piotr Kowalski becomes the 184th developer to have a patch pushed
 June 5-7 2012	Kohacon12 in Edinburgh
 June 9-11 2012	Kohacon12 hackfest in Edinburgh
-June 10 2012	Shari Perkins becomes the 184th developer to have a patch pushed
-June 20 2012	Claire Hernandez becomes the 185th developer to have a patch pushed
+June 10 2012	Shari Perkins becomes the 185th developer to have a patch pushed
+June 20 2012	Claire Hernandez becomes the 186th developer to have a patch pushed
 June 22 2012	Koha 3.8.2 released	releases
 June 23 2012	Koha 3.6.6 released	releases
-July 3 2012	Mark Tompsett becomes the 186th developer to have a patch pushed
-July 7 2012	Stacey Walker becomes the 187th developer to have a patch pushed
-July 7 2012	Mirko Tietgen becomes the 188th developer to have a patch pushed
+July 3 2012	Mark Tompsett becomes the 187th developer to have a patch pushed
+July 7 2012	Stacey Walker becomes the 188th developer to have a patch pushed
+July 7 2012	Mirko Tietgen becomes the 189th developer to have a patch pushed
 July 22 2012	Koha 3.8.3 released	releases
 July 22 2012	Koha 3.6.7 released	releases
 August 22 2012	Koha 3.8.4 released	releases
 August 22 2012	Koha 3.6.8 released	releases
-September 3 2012	Kathryn Tyree becomes the 189th developer to have a patch pushed
-September 11 2012	Melia Meggs becomes the 190th developer to have a patch pushed
-September 20 2012	Joseph Alway beomes the 191st developer to have a patch pushed
+September 3 2012	Kathryn Tyree becomes the 190th developer to have a patch pushed
+September 11 2012	Melia Meggs becomes the 191st developer to have a patch pushed
+September 20 2012	Joseph Alway beomes the 192nd developer to have a patch pushed
 September 22 2012	Koha 3.8.5 released	releases
 September 22 2012	Koha 3.6.9 released	releases
-October 13 2012	Ivan Brown becomes the 192nd developer to have a patch pushed
-October 22 2012	Mathieu Saby becomes the 193rd developer to have a patch pushed
+October 13 2012	Ivan Brown becomes the 193rd developer to have a patch pushed
+October 22 2012	Mathieu Saby becomes the 194th developer to have a patch pushed
 October 22 2012	Koha 3.8.6 released	releases
 October 23 2012	Koha 3.6.10 released	releases
-October 26 2012	Robert Williams becomes the 194th developer to have a patch pushed
+October 26 2012	Robert Williams becomes the 195th developer to have a patch pushed
 November 22 2012	Koha 3.8.7 released	releases
 November 23 2012	Koha 3.10.0 released	releases
-December 12 2012	Romina Racca becomes the 195th developer to have a patch pushed
-December 17 2012	Vitor Fernandes becomes the 196th developer to have a patch pushed
-December 21 2012	Nadia Nicolaides becomes the 197th developer to have a patch pushed
-December 27 2012	Bernardo Gonzalez Kriegel becomes the 198th developer to have a patch pushed
-
+December 12 2012	Romina Racca becomes the 196th developer to have a patch pushed
+December 17 2012	Vitor Fernandes becomes the 197th developer to have a patch pushed
+December 21 2012	Nadia Nicolaides becomes the 198th developer to have a patch pushed
+December 22 2012	Koha 3.10.1 released	releases
+December 22 2012	Koha 3.8.8 released	releases
+December 27 2012	Koha 3.6.11 released	releases
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 6c8ea00..59451a9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -177,14 +177,14 @@
                 <li>Richard Anderson</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692181851">Nahuel Angelinetti</a></li>
                 <li>Nuño López Ansótegui</li>
-             <li>Tomás Cohen Arazi</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>
                 <li>Larry Baerveldt</li>
                 <li>Al Banks</li>
                 <li>Daniel Banzli</li>
-                 <li>Greg Barniskis</li>
+                <li>Greg Barniskis</li>
                 <li>Benedykt P. Barszcz (Polish for 2.0)</li>
                 <li>D Ruth Bavousett</li>
                 <li>John Beppu</li>
@@ -244,6 +244,7 @@
                 <li>Mark Gavillet</li>
                 <li>Daniel Kahn Gillmor</li>
                 <li>David Goldfein</li>
+                <li>Bernardo Gonzalez Kriegel</li>
                 <li>Daniel Grobani</li>
                 <li>Amit Gupta</li>
                 <li>Michael Hafen</li>
-- 
1.7.10.4