Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Mon, 31 Oct 2016 21:09:02 +0000 (17:09 -0400)
committerEquinox <info@esilibrary.com>
Mon, 31 Oct 2016 21:09:02 +0000 (17:09 -0400)

Trivial merge