Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Tue, 21 Feb 2017 22:21:01 +0000 (17:21 -0500)
committerEquinox <info@esilibrary.com>
Tue, 21 Feb 2017 22:21:01 +0000 (17:21 -0500)

Trivial merge