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

Conflicts:
	evergreen-history.txt

Signed-off-by: Garry Collum <gcollum@kentonlibrary.org>

diff --cc evergreen-history.txt
index 412de74,ad62180..23f6efc
--- 1/evergreen-history.txt
--- 2/evergreen-history.txt
+++ b/evergreen-history.txt
@@@ -10,7 -12,7 +12,8 @@@
  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
- 2012-08-21 Kenton County Public Library goes live on Evergreen
+ 2012-08-08 East Grand Forks Library (Minnesota) goes live on Evergren
++2011-08-21 Kenton County Public Library goes live on Evergreen
  2013-03-22 Evergreen 2.2.7 released
  2013-04-10/2013-04-13 Fifth Evergreen Conference held in Vancouver, British Columbia
  2013-04-17 Evergreen 2.1.6 released (security release)