Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys

author Chris Sharp <csharp@georgialibraries.org>

Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)

committer Chris Sharp <csharp@georgialibraries.org>

Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)
author Chris Sharp <csharp@georgialibraries.org>
Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)
committer Chris Sharp <csharp@georgialibraries.org>
Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)
diff --cc templates/setup-vars

index 1c2ed56,6864676..593792d

mode 100644,100755..100755
--- 1/templates/setup-vars
--- 2/templates/setup-vars
+++ b/templates/setup-vars
author	Chris Sharp <csharp@georgialibraries.org>
	Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)
committer	Chris Sharp <csharp@georgialibraries.org>
	Thu, 20 Jul 2017 17:45:27 +0000 (13:45 -0400)