Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Wed, 4 May 2016 17:33:02 +0000 (13:33 -0400)
committerEquinox <info@esilibrary.com>
Wed, 4 May 2016 17:33:02 +0000 (13:33 -0400)

Trivial merge