updating history.txt : 3.6.0 & 3.4.6 & KohaCon11 & Joy Nelson 160th

diff --git a/docs/history.txt b/docs/history.txt
index 3c30815..5a5adaa 100644 (file)
--- a/docs/history.txt
+++ b/docs/history.txt
@@ -578,4 +578,8 @@ September 24 2011   Larry Baerveldt becomes the 157th developer to have a patch pu
 September 27 2011      Koha 3.4.5 released
 September 28 2011      Thatcher Rea becomes the 158th 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 159th developer to have a patch pushed
\ No newline at end of file
+October 15 2011        Greg Barniskis becomes the 159th developer to have a patch pushed
+October 22 2011 Koha 3.6.0 released
+October 31 2011 4th KohaCon in Mumbaï, India
+November 9 2011 Koha 3.4.6 released
+Novembre 17 2011 Joy Nelson becomes the 160th developer to have a patch pushed