Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 15 Mar 2017 02:48:02 +0000 (22:48 -0400)
committerEquinox <info@esilibrary.com>
Wed, 15 Mar 2017 02:48:02 +0000 (22:48 -0400)

Trivial merge