From f0a1165a2c3e32fb8e2b1ac48793f6d34c54cb2b Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri, 3 Jun 2011 11:37:33 +1200
Subject: [PATCH] Bug 6350 - Keeping history page up to date

---
 docs/history.txt                                 | 3 +++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/history.txt b/docs/history.txt
index e6b8abb171..66afecfb0e 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -545,3 +545,6 @@ April 20 2011   Fernando Canizo becomes the 142nd developer to have a patch push
 April 22 2011	Koha 3.4.0 released	releases
 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 3 2011	Elliott Davis becomes the 143rd developer to have a patch pushed
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 93f2144b54..28bcea2f1c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -99,8 +99,10 @@
                 
             <h2>Koha Release Team</h2>
             <ul>
+               <li><strong>Colin Campbell</strong>(Koha 3.4 QA Manager)</li>
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544614260">Galen Charlton</a></strong> (Koha 3.2 Release Manager)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609030">Chris Cormack</a></strong> (Koha 1.x, 3.4, 3.6 Release Manager, Koha 3.2 Translation Manager)</li>
+	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6620692210484">Frédéric Demians</a></strong>(Koha 3.4, 3.6 Translation Manager)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544646984">Nicole C. Engard</a></strong> (Koha 3.x Documentation Manager)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544609053">Joshua Ferraro</a></strong> (Koha 3.0 Release Manager &amp; Translation Manager)</li>
 	           <li><strong>Rachel Hamilton-Williams</strong> (Kaitiaki from 2004 to present)</li>
@@ -109,7 +111,7 @@
                <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544615991">Chris Nighswonger</a></strong> (Koha 3.2, 3.4 Release Maintainer)</li>
 	           <li><strong><a href="https://www.ohloh.net/p/koha/contributors/6618544612249">Paul Poulain</a></strong> (Koha 2.0 Release Manager, Koha 2.2 Release Manager/Maintainer)</li>
 	           <li><strong><a href="http://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></strong> (Koha 2.0 Release Maintainer)</li>
-                   <li><strong>Ian Walls</strong> Koha 3.6 QA Manager</li>
+                <li><strong>Ian Walls</strong> Koha 3.6 QA Manager</li>
                 </ul>
             <h2>Koha Development Team</h2>
 			<ul>
@@ -147,6 +149,7 @@
 		<li>Christophe Croullebois</li>
                 <li>Nate Curulla</li>
                 <li>Vincent Danjean</li>
+                <li>Elliott Davis</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>
-- 
2.20.1