Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF
authorEquinox <info@esilibrary.com>
Fri, 19 Jun 2015 18:24:03 +0000 (14:24 -0400)
committerEquinox <info@esilibrary.com>
Fri, 19 Jun 2015 18:24:03 +0000 (14:24 -0400)

Trivial merge