Merge remote branch 'kc/new/bug_5175' into kcmaster

[srvgit] / docs / history.txt

diff --git a/docs/history.txt b/docs/history.txt
index 7750fe6..dfc4b4c 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -172,7 +172,7 @@ Feb 11 2004  Paul Poulain announces release of 2.0.0rc4
 Feb 19 2004     Stephen Hedges provides his migrating to Koha documentation to the community
 Mar 7 2004      Installation guide improved and released in pdf format
 Mar 30 2004     Baiju M provides a neat migrating from CDS/ISIS to Koha document
-April 1 20004   Koha 2.0.0 released
+April 1 2004    Koha 2.0.0 released
 April 17 2004   Nicholas S. Rosasco resurrects and updates the FAQ
 April 17 2004   Seminar on Koha at Cairo University, Egypt
 May 13-16 2004  Zeki Celikbas presents Koha at a linux festival in Ankara, Turkey
@@ -492,6 +492,7 @@ May 4 2010  Koustubha Kale becomes the 112th committer to have a patch accepted
 May 4 2010     Community Handover meeting http://wiki.koha-community.org/wiki/Community_Handover_IRC_Meeting,_4_May_2010
 May 5 2010     General IRC meeting http://wiki.koha-community.org/wiki/General_Meeting,_May_5_2010
 May 5 2010     Matthew Hunt becomes the 113th committer to have a patch accepted
+May 17 2010    Koha 3.0.6 released
 May 19 2010    Marcel de Rooy becomes the 114th committer to have a patch accepted
 July 19 2010   Andrew Chilton becomes the 115th committer to have a patch accepted
 June 2 2010    General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_2_June_2010
@@ -501,3 +502,8 @@ July 13 2010        License meeting http://wiki.koha-community.org/wiki/License_Upgrade
 August 11 2010 General IRC meeting http://wiki.koha-community.org/wiki/General_IRC_Meeting,_11_August_2010
 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 116th committer to have a patch accepted
+October 22 2010        Koha 3.2.0 released
+October 25-31 2010     Kohacon10 in Wellington
+October 30 2010        Brian Engard becomes the 117th committer to have a patch accepted
+October 30 2010 Daniel Grobani becomes the 118th committer to have a patch accepted
+October 31 2010        Nate Curulla becomes the 119th committer to have patch accepted