From: Michael Peters <mpeters@emeralddata.net>
Date: Wed, 9 Sep 2015 12:55:13 +0000 (-0400)
Subject: Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=87da8425b0a2be98ca63c8c64470fd4153abddea;p=contrib%2Fpines%2Fgenasys.git

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

Conflicts:
	GenaSYS.sh
	templates/debs/evergreen-ils_2.7.1a_amd64.deb
---

87da8425b0a2be98ca63c8c64470fd4153abddea