From: Galen Charlton <gmcharlt@gmail.com>
Date: Wed, 19 Mar 2014 14:45:06 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:history
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=413df389ee0cbcceed02f37b2fb9c05afe3f9139;p=history.git

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

Conflicts:
	evergreen-history.txt
---

413df389ee0cbcceed02f37b2fb9c05afe3f9139
diff --cc evergreen-history.txt
index 8dc6c06,031f9a3..da40421
--- a/evergreen-history.txt
+++ b/evergreen-history.txt
@@@ -6,7 -6,7 +6,8 @@@
  2007-09-08 Dan Scott named a committer
  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-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