Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 2 Mar 2017 15:33:02 +0000 (10:33 -0500)
committerEquinox <info@esilibrary.com>
Thu, 2 Mar 2017 15:33:02 +0000 (10:33 -0500)

Trivial merge