Merge branch 'master' of git.evergreen-ils.org:history

Conflicts:
	evergreen-history.txt

diff --cc evergreen-history.txt
index 24a063c,da40421..ad62180
--- 1/evergreen-history.txt
--- 2/evergreen-history.txt
+++ b/evergreen-history.txt
@@@ -7,7 -7,7 +7,8 @@@
  2005-07-27 Evergreen alpha release
  2009-05-20/2009-05-22 First Evergreen Conference held in Athens, Georgia
  2009-06-28 First wave of SCLENDS libraries go live, Beaufort County, State Library, Union County
 +2009-10-15 Second wave of SCLENDS libraries go live, Dorchester County, Chesterfield County, Calhoun County, York County
+ 2009-09-10 North Texas Library Consortium goes live on Evergreen.
  2010-04-21/2010-04-23 Second Evergreen Conference held in Grand Rapids, Michigan
  2011-04-27/2011-04-30 Third Evergreen Conference held in Decatur, Georgia
  2012-04-25/2012-04-28 Fourth Evergreen Conference held in Indianapolis, Indiana