Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys
authorAndy Witter <awitter@georgialibraries.org>
Thu, 20 Jul 2017 18:19:17 +0000 (14:19 -0400)
committerAndy Witter <awitter@georgialibraries.org>
Thu, 20 Jul 2017 18:19:17 +0000 (14:19 -0400)

Trivial merge