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

Trivial merge