Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys
authorMichael Peters <mpeters@emeralddata.net>
Wed, 9 Sep 2015 12:55:13 +0000 (08:55 -0400)
committerAndy Witter <awitter@georgialibraries.org>
Wed, 9 Sep 2015 12:55:13 +0000 (08:55 -0400)
commit87da8425b0a2be98ca63c8c64470fd4153abddea
tree95ed3f5cc25fea3fa7390cf6050b4483f777d8cc
parent947a9ffc096bd520a89b59f180871db75360935a
parentd8cb228db2d62c07f7da825b321b730dacf3bafe
Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys

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