[Koha-patches] [PATCH] Updating credits and history document

[Chris Cormack]

---
 docs/history.txt                                   |    8 ++++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl |   10 ++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/history.txt b/docs/history.txt
index d7d152d..90844d7 100644
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -460,3 +460,11 @@ December 20 2009 NYUHSL becomes the 100th committer to have a patch accepted	dev
 December 23 2009	Sharon Moreland becomes the 101st committer to have a patch accepted (sent via Liz Rea)	developer
 January 13 2010	IRC General Meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10jan13
 January 15 2010	PTFS announce intention to buy Liblime
+February 2 2010	Community Handover meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10feb02
+February 2 2010	koha-community.org website started
+February 3 2010	Koha 3.2.0 Alpha released
+February 9 2010	General IRC meeting http://wiki.koha.org/doku.php?id=en:events:meetings:irc_meetings:meetingnotes10feb09
+February 11 2010	Acquisition called off
+February 11 2010	Equinox begin to offer Koha support
+February 15 2010	Will Stokes becomes the 102nd committer to have a patch accepted
+February 16 2010	Kohacon10 IRC meeting http://wiki.koha.org/doku.php?id=en:kohacon2010:meetingminutes16feb
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
index 9011002..9a18047 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
@@ -151,7 +151,8 @@
                 <li>Dorian Meid (German translation)</li>
                 <li>Matthias Meusburger</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6618544607803">Andrew Moore</a></li>
-                <li>Mike Mylonas</li>
+                <li>Sharon Moreland</li>
+ 		<li>Mike Mylonas</li>
                 <li><a href="https://www.ohloh.net/accounts/cnighswonger">Chris Nighswonger</a></li>
                 <li>Polytechnic University</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
@@ -161,6 +162,7 @@
                 <li>Pawel Skuza (Polish for 1.2)</li>
                 <li>Southeastern University</li>
                 <li>Glen Stewart</li>
+		<li>Will Stokes</li>
                 <li>David Strainchamps</li>
                 <li>Ed Summers (Some code and Perl packages like MARC::Record)</li>
                 <li>Daniel Sweeney</li>
@@ -172,9 +174,11 @@
                 <li>Andrei V. Toutoukine</li>
                 <li>Darrell Ulm</li>
                 <li>Universidad ORT Uruguay (Ernesto Silva, Andres Tarallo)</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>
                 <li>Rick Welykochy</li>
+		<li>Piotr Wejman</li>
                 <li>Ron Wickersham</li>
                 <li><a href="https://www.ohloh.net/p/koha/contributors/6620692127299">Olwen Williams (Database design and data extraction for Koha 1.0)</a></li>
                 <li>James Winter</li>
@@ -182,7 +186,9 @@
             <h3>Contributing Companies</h3>
             <ul>
                 <li><strong>BibLibre</strong>, France</li>
-                <li><strong>Katipo Communications</strong></li>
+		<li><strong>ByWater Solutions</strong>, USA</li>
+		<li><strong>Catalyst IT</strong>, New Zealand</li>
+                <li><strong>Katipo Communications</strong>, New Zealand</li>
                 <li><strong>LibLime</strong>, USA</li> 
 		<li><strong>Nelsonville Public Library</strong>, Ohio, USA</li>
 		<li><strong>PTFS</strong>, Maryland, USA</li>
-- 
1.6.3.3