Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Tue, 21 Mar 2017 13:39:02 +0000 (09:39 -0400)
committerEquinox <info@esilibrary.com>
Tue, 21 Mar 2017 13:39:02 +0000 (09:39 -0400)

Trivial merge