From: Liz Rea <wizzyrea@gmail.com>
Date: Tue, 17 Jan 2012 21:30:31 +0000 (-0600)
Subject: Bug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders
X-Git-Url: http://git.rot13.org/?p=koha.git;a=commitdiff_plain;h=c7c892ae3408b8c5472d748dea8402966f51a8c6

Bug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---

diff --git a/docs/history.txt b/docs/history.txt
index 602c656c39..df0962845a 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -592,5 +592,8 @@ December 7 2011	Jon Aker becomes the 164th developer to have a patch pushed
 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
-January 18 2012	Olivier Crouzet becomes the 168th developer to have a patch pushed
+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
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 5b7a30c058..46f07241a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -158,6 +158,7 @@
                 <li>Elliott Davis</li>
 		<li>Doug Dearden</li>
                 <li>Kip DeGraaf</li>
+                <li>Connor Dewar</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>
@@ -214,6 +215,7 @@
                 <li>Gynn Lomax</li>
                 <li>Robert Lyon (Corporate Serials)</li>
                 <li>Francois Marier</li>
+                <li>Jesse Maseto</li>
                 <li>Frère Sébastien Marie</li>
                 <li>Ricardo Dias Marques</li>
 		<li>Julian Maurice</li>
@@ -244,6 +246,7 @@
                 <li>Marcel de Rooy</li>
 		<li>Salvador Zaragoza Rubio</li>
 		<li>Brice Sanchez</li>
+		<li>Sam Sanders</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544619438">Robin Sheat</a></li>
 		<li>John Seymour</li>
 		<li>Juan Romay Sieira</li>