Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Thu, 4 Feb 2016 16:30:02 +0000 (11:30 -0500)
committerEquinox <info@esilibrary.com>
Thu, 4 Feb 2016 16:30:02 +0000 (11:30 -0500)

Trivial merge