Merge branch 'master' of git.evergreen-ils.org:contrib/pines/genasys
authorAndy Witter <awitter@georgialibraries.org>
Mon, 23 Nov 2015 18:06:07 +0000 (13:06 -0500)
committerAndy Witter <awitter@georgialibraries.org>
Mon, 23 Nov 2015 18:06:07 +0000 (13:06 -0500)

Trivial merge